From: Jeroen van der Heijden Date: Fri, 20 Jul 2018 07:39:54 +0000 (+0200) Subject: Compatible with gnu90 X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~92 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=7ba08d573147e8388ec10cc7e06abfff1f6fd1e7;p=siridb-server.git Compatible with gnu90 --- diff --git a/include/cexpr/cexpr.h b/include/cexpr/cexpr.h index 2a37a4b3..b32093cb 100644 --- a/include/cexpr/cexpr.h +++ b/include/cexpr/cexpr.h @@ -18,14 +18,14 @@ typedef enum cexpr_operator { - CEXPR_EQ, // equal - CEXPR_NE, // not equal - CEXPR_GT, // greater than - CEXPR_LT, // less than - CEXPR_GE, // greater than or equal to - CEXPR_LE, // less than or equal to - CEXPR_IN, // contains (string) - CEXPR_NI, // not contains (string) + CEXPR_EQ, /* equal */ + CEXPR_NE, /* not equal */ + CEXPR_GT, /* greater than */ + CEXPR_LT, /* less than */ + CEXPR_GE, /* greater than or equal to */ + CEXPR_LE, /* less than or equal to */ + CEXPR_IN, /* contains (string) */ + CEXPR_NI, /* not contains (string) */ CEXPR_AND, CEXPR_OR, } cexpr_operator_t; @@ -57,7 +57,7 @@ typedef union cexpr_via_u typedef struct cexpr_s { - cexpr_operator_t operator; // AND/OR + cexpr_operator_t operator; /* AND/OR */ int8_t tp_a; int8_t tp_b; cexpr_via_t via_a; diff --git a/include/qpack/qpack.h b/include/qpack/qpack.h index c8c0c574..c7a79d04 100644 --- a/include/qpack/qpack.h +++ b/include/qpack/qpack.h @@ -24,9 +24,9 @@ typedef enum * Values with -##- will never be returned while unpacking. For example * a QP_INT8 (1 byte signed integer) will be returned as QP_INT64. */ - QP_END, // at the end while unpacking - QP_ERR, // error - QP_RAW, // raw string + QP_END, /* at the end while unpacking */ + QP_ERR, /* error */ + QP_RAW, /* raw string */ /* * Both END and RAW are never actually packed but 0 and 1 are reserved * for positive signed integers. @@ -36,41 +36,41 @@ typedef enum * Fixed negative integers from -60 till -1 [ 64...123 ] * */ - QP_HOOK=124, // Hook is not used by SiriDB - QP_DOUBLE_N1=125, // ## double value -1.0 - QP_DOUBLE_0, // ## double value 0.0 - QP_DOUBLE_1, // ## double value 1.0 + QP_HOOK=124, /* Hook is not used by SiriDB */ + QP_DOUBLE_N1=125, /* ## double value -1.0 */ + QP_DOUBLE_0, /* ## double value 0.0 */ + QP_DOUBLE_1, /* ## double value 1.0 */ /* * Fixed raw strings lengths from 0 till 99 [ 128...227 ] */ - QP_RAW8=228, // ## raw string with length < 1 byte - QP_RAW16, // ## raw string with length < 1 byte - QP_RAW32, // ## raw string with length < 1 byte - QP_RAW64, // ## raw string with length < 1 byte - QP_INT8, // ## 1 byte signed integer - QP_INT16, // ## 2 byte signed integer - QP_INT32, // ## 4 byte signed integer - QP_INT64, // 8 bytes signed integer - QP_DOUBLE, // 8 bytes double - QP_ARRAY0, // empty array - QP_ARRAY1, // array with 1 item - QP_ARRAY2, // array with 2 items - QP_ARRAY3, // array with 3 items - QP_ARRAY4, // array with 4 items - QP_ARRAY5, // array with 5 items - QP_MAP0, // empty map - QP_MAP1, // map with 1 item - QP_MAP2, // map with 2 items - QP_MAP3, // map with 3 items - QP_MAP4, // map with 4 items - QP_MAP5, // map with 5 items - QP_TRUE, // boolean true - QP_FALSE, // boolean false - QP_NULL, // null (none, nil) - QP_ARRAY_OPEN, // open a new array - QP_MAP_OPEN, // open a new map - QP_ARRAY_CLOSE, // close array - QP_MAP_CLOSE, // close map + QP_RAW8=228, /* ## raw string with length < 1 byte */ + QP_RAW16, /* ## raw string with length < 1 byte */ + QP_RAW32, /* ## raw string with length < 1 byte */ + QP_RAW64, /* ## raw string with length < 1 byte */ + QP_INT8, /* ## 1 byte signed integer */ + QP_INT16, /* ## 2 byte signed integer */ + QP_INT32, /* ## 4 byte signed integer */ + QP_INT64, /* 8 bytes signed integer */ + QP_DOUBLE, /* 8 bytes double */ + QP_ARRAY0, /* empty array */ + QP_ARRAY1, /* array with 1 item */ + QP_ARRAY2, /* array with 2 items */ + QP_ARRAY3, /* array with 3 items */ + QP_ARRAY4, /* array with 4 items */ + QP_ARRAY5, /* array with 5 items */ + QP_MAP0, /* empty map */ + QP_MAP1, /* map with 1 item */ + QP_MAP2, /* map with 2 items */ + QP_MAP3, /* map with 3 items */ + QP_MAP4, /* map with 4 items */ + QP_MAP5, /* map with 5 items */ + QP_TRUE, /* boolean true */ + QP_FALSE, /* boolean false */ + QP_NULL, /* null (none, nil) */ + QP_ARRAY_OPEN, /* open a new array */ + QP_MAP_OPEN, /* open a new map */ + QP_ARRAY_CLOSE, /* close array */ + QP_MAP_CLOSE, /* close map */ } qp_types_t; typedef union qp_via_u @@ -91,7 +91,7 @@ typedef struct qp_obj_s typedef struct qp_unpacker_s { - unsigned char * source; // can be NULL or a copy or the source + unsigned char * source; /* can be NULL or a copy or the source */ unsigned char * pt; unsigned char * end; } qp_unpacker_t; @@ -105,9 +105,9 @@ typedef struct qp_packer_s } qp_packer_t; typedef FILE qp_fpacker_t; -#define qp_open fopen // returns NULL in case of an error -#define qp_close fclose // 0 if successful, EOF in case of an error -#define qp_flush fflush // 0 if successful, EOF in case of an error +#define qp_open fopen /* returns NULL in case of an error */ +#define qp_close fclose /* 0 if successful, EOF in case of an error */ +#define qp_flush fflush /* 0 if successful, EOF in case of an error */ /* packer: create, destroy and extend functions */ qp_packer_t * qp_packer_new(size_t alloc_size); diff --git a/include/siri/admin/client.h b/include/siri/admin/client.h index 67f56ccc..eec0f252 100644 --- a/include/siri/admin/client.h +++ b/include/siri/admin/client.h @@ -24,7 +24,7 @@ typedef struct siri_admin_client_s uint16_t pid; uint16_t port; uuid_t uuid; - int pool; // -1 for a new pool + int pool; /* -1 for a new pool */ char * host; char * username; char * password; diff --git a/include/siri/db/aggregate.h b/include/siri/db/aggregate.h index 95ea715b..dd2a4a9a 100644 --- a/include/siri/db/aggregate.h +++ b/include/siri/db/aggregate.h @@ -29,7 +29,7 @@ typedef struct siridb_aggr_s uint64_t group_by; uint64_t limit; uint64_t offset; - double timespan; // used for derivative + double timespan; /* used for derivative */ pcre2_code * regex; \ pcre2_match_data * match_data; qp_via_t filter_via; diff --git a/include/siri/db/db.h b/include/siri/db/db.h index 8821c0ff..13e68b67 100644 --- a/include/siri/db/db.h +++ b/include/siri/db/db.h @@ -31,13 +31,13 @@ #include #define SIRIDB_MAX_SIZE_ERR_MSG 1024 -#define SIRIDB_MAX_DBNAME_LEN 256 // 255 + NULL +#define SIRIDB_MAX_DBNAME_LEN 256 /* 255 + NULL */ #define SIRIDB_SCHEMA 3 #define SIRIDB_FLAG_REINDEXING 1 -#define DEF_DROP_THRESHOLD 1.0 // 100% -#define DEF_SELECT_POINTS_LIMIT 1000000 // one million -#define DEF_LIST_LIMIT 10000 // ten thousand +#define DEF_DROP_THRESHOLD 1.0 /* 100% */ +#define DEF_SELECT_POINTS_LIMIT 1000000 /* one million */ +#define DEF_LIST_LIMIT 10000 /* ten thousand */ #define SIRIDB_GET_FN(FN, __path, FILENAME) \ char FN[strlen(__path) + strlen(FILENAME) + 1]; \ @@ -87,9 +87,9 @@ typedef struct siridb_s iso8601_tz_t tz; size_t buffer_size; size_t buffer_len; - struct timespec start_time; // to calculate up-time. - uint64_t duration_num; // number duration in s, ms, us or ns - uint64_t duration_log; // log duration in s, ms, us or ns + struct timespec start_time; /* to calculate up-time. */ + uint64_t duration_num; /* number duration in s, ms, us or ns */ + uint64_t duration_log; /* log duration in s, ms, us or ns */ char * dbname; char * dbpath; char * buffer_path; diff --git a/include/siri/db/ffile.h b/include/siri/db/ffile.h index 0969c330..e1c9b799 100644 --- a/include/siri/db/ffile.h +++ b/include/siri/db/ffile.h @@ -24,7 +24,7 @@ typedef struct siridb_ffile_s uint64_t id; char * fn; uint32_t free_space; - uint32_t next_size; // must be uint32_t (4 bytes) + uint32_t next_size; /* must be uint32_t (4 bytes) */ FILE * fp; int fd; long int size; diff --git a/include/siri/db/fifo.h b/include/siri/db/fifo.h index 77694baf..4796fb08 100644 --- a/include/siri/db/fifo.h +++ b/include/siri/db/fifo.h @@ -21,7 +21,7 @@ typedef struct siridb_fifo_s llist_t * fifos; siridb_ffile_t * in; siridb_ffile_t * out; - ssize_t max_id; // max_id can be -1 + ssize_t max_id; /* max_id can be -1 */ } siridb_fifo_t; diff --git a/include/siri/db/insert.h b/include/siri/db/insert.h index 92a081c7..eb07ef06 100644 --- a/include/siri/db/insert.h +++ b/include/siri/db/insert.h @@ -33,7 +33,7 @@ typedef enum ERR_EXPECTING_AT_LEAST_ONE_POINT, ERR_EXPECTING_NAME_AND_POINTS, ERR_INCOMPATIBLE_SERVER_VERSION, - ERR_MEM_ALLOC, // This is a critical error. + ERR_MEM_ALLOC, /* This is a critical error. */ } siridb_insert_err_t; enum diff --git a/include/siri/db/query.h b/include/siri/db/query.h index 44265053..66697a25 100644 --- a/include/siri/db/query.h +++ b/include/siri/db/query.h @@ -21,10 +21,10 @@ */ typedef enum { - SIRIDB_QUERY_FWD_SERVERS, // Forward to all 'online' servers - SIRIDB_QUERY_FWD_POOLS, // Forward to all pools(*) - SIRIDB_QUERY_FWD_SOME_POOLS, // Forward to some pools(*) - SIRIDB_QUERY_FWD_UPDATE // Forward to all pools, update replicas(*) + SIRIDB_QUERY_FWD_SERVERS, /* Forward to all 'online' servers */ + SIRIDB_QUERY_FWD_POOLS, /* Forward to all pools(*) */ + SIRIDB_QUERY_FWD_SOME_POOLS, /* Forward to some pools(*) */ + SIRIDB_QUERY_FWD_UPDATE /* Forward to all pools, upd repl(*) */ } siridb_query_fwd_t; diff --git a/include/siri/db/server.h b/include/siri/db/server.h index c86fa29e..17ad35ad 100644 --- a/include/siri/db/server.h +++ b/include/siri/db/server.h @@ -33,13 +33,18 @@ and will NEVER be set on 'this' server */ -#define SERVER__IS_ONLINE 65 // RUNNING + AUTHENTICATED -#define SERVER__IS_SYNCHRONIZING 67 // RUNNING + SYNCHRONIZING + AUTHENTICATED -#define SERVER__IS_REINDEXING 69 // RUNNING + REINDEXING + AUTHENTICATED +/* RUNNING + AUTHENTICATED */ +#define SERVER__IS_ONLINE 65 -#define SERVER__SELF_ONLINE 1 // RUNNING -#define SERVER__SELF_SYNCHRONIZING 3 // RUNNING + SYNCHRONIZING -#define SERVER__SELF_REINDEXING 5 // RUNNING + REINDEXING +/* RUNNING + SYNCHRONIZING + AUTHENTICATED */ +#define SERVER__IS_SYNCHRONIZING 67 + +/* RUNNING + REINDEXING + AUTHENTICATED */ +#define SERVER__IS_REINDEXING 69 + +#define SERVER__SELF_ONLINE 1 /* RUNNING */ +#define SERVER__SELF_SYNCHRONIZING 3 /* RUNNING + SYNCHRONIZING */ +#define SERVER__SELF_REINDEXING 5 /* RUNNING + REINDEXING */ /* diff --git a/include/siri/db/shard.h b/include/siri/db/shard.h index db9194ac..012b01e1 100644 --- a/include/siri/db/shard.h +++ b/include/siri/db/shard.h @@ -28,7 +28,7 @@ #define SIRIDB_SHARD_IS_CORRUPT 64 #define SIRIDB_SHARD_IS_COMPRESSED 128 -// HAS_OVERLAP + HAS_NEW_VALUES + HAS_DROPPED_SERIES + IS_CORRUPT +/* HAS_OVERLAP + HAS_NEW_VALUES + HAS_DROPPED_SERIES + IS_CORRUPT */ #define SIRIDB_SHARD_NEED_OPTIMIZE 78 /* types */ diff --git a/include/siri/grammar/grammar.h b/include/siri/grammar/grammar.h index b8feaa16..b7c9033f 100644 --- a/include/siri/grammar/grammar.h +++ b/include/siri/grammar/grammar.h @@ -15,7 +15,7 @@ cleri_grammar_t * compile_grammar(void); enum cleri_grammar_ids { - CLERI_NONE, // used for objects with no name + CLERI_NONE, /* used for objects with no name */ CLERI_GID_ACCESS_EXPR, CLERI_GID_ACCESS_KEYWORDS, CLERI_GID_AFTER_EXPR, @@ -306,7 +306,7 @@ enum cleri_grammar_ids { CLERI_GID_WHERE_SHARD, CLERI_GID_WHERE_USER, CLERI_GID__BOOLEAN, - CLERI_END // can be used to get the enum length + CLERI_END /* can be used to get the enum length */ }; #endif /* CLERI_EXPORT_SIRI_GRAMMAR_GRAMMAR_H_ */ diff --git a/include/siri/net/pkg.h b/include/siri/net/pkg.h index 3af249ae..6dad1f50 100644 --- a/include/siri/net/pkg.h +++ b/include/siri/net/pkg.h @@ -17,7 +17,7 @@ typedef struct sirinet_pkg_s { - uint32_t len; // length of data, sizeof(sirinet_pkg_t) is not included + uint32_t len; /* length of data, sizeof(sirinet_pkg_t) is not included */ uint16_t pid; uint8_t tp; uint8_t checkbit; diff --git a/include/siri/net/promise.h b/include/siri/net/promise.h index 39456f30..6a915820 100644 --- a/include/siri/net/promise.h +++ b/include/siri/net/promise.h @@ -17,17 +17,17 @@ #include #include -#define PROMISE_DEFAULT_TIMEOUT 30000 // 30 seconds +#define PROMISE_DEFAULT_TIMEOUT 30000 /* 30 seconds */ typedef struct siridb_server_s siridb_server_t; typedef struct sirinet_promise_s sirinet_promise_t; typedef enum { - PROMISE_TIMEOUT_ERROR=-4, // in case of a time out - PROMISE_WRITE_ERROR, // socket write error - PROMISE_CANCELLED_ERROR, // timer is cancelled - PROMISE_PKG_TYPE_ERROR, // unexpected package type received + PROMISE_TIMEOUT_ERROR=-4, /* in case of a time out */ + PROMISE_WRITE_ERROR, /* socket write error */ + PROMISE_CANCELLED_ERROR, /* timer is cancelled */ + PROMISE_PKG_TYPE_ERROR, /* unexpected package type received */ PROMISE_SUCCESS=0 } sirinet_promise_status_t; diff --git a/include/siri/net/protocol.h b/include/siri/net/protocol.h index e2b3f3cd..c8cd1c41 100644 --- a/include/siri/net/protocol.h +++ b/include/siri/net/protocol.h @@ -13,77 +13,77 @@ typedef enum { - CPROTO_REQ_QUERY, // (query, time_precision) - CPROTO_REQ_INSERT, // series with points map/array - CPROTO_REQ_AUTH, // (user, password, dbname) - CPROTO_REQ_PING, // empty - CPROTO_REQ_INFO, // empty - CPROTO_REQ_LOADDB, // database path - CPROTO_REQ_REGISTER_SERVER, // (uuid, host, port, pool) - CPROTO_REQ_FILE_SERVERS, // empty - CPROTO_REQ_FILE_USERS, // empty - CPROTO_REQ_FILE_GROUPS, // empty - CPROTO_REQ_FILE_DATABASE, // empty + CPROTO_REQ_QUERY, /* (query, time_precision) */ + CPROTO_REQ_INSERT, /* series with points map/array */ + CPROTO_REQ_AUTH, /* (user, password, dbname) */ + CPROTO_REQ_PING, /* empty */ + CPROTO_REQ_INFO, /* empty */ + CPROTO_REQ_LOADDB, /* database path */ + CPROTO_REQ_REGISTER_SERVER, /* (uuid, host, port, pool) */ + CPROTO_REQ_FILE_SERVERS, /* empty */ + CPROTO_REQ_FILE_USERS, /* empty */ + CPROTO_REQ_FILE_GROUPS, /* empty */ + CPROTO_REQ_FILE_DATABASE, /* empty */ /* Administrative API request */ - CPROTO_REQ_ADMIN=32, // (user, password, request, {...}) + CPROTO_REQ_ADMIN=32, /* (user, password, request, {...}) */ } cproto_client_t; typedef enum { /* success */ - CPROTO_RES_QUERY, // {query response data} - CPROTO_RES_INSERT, // {"success_msg": ...} - CPROTO_RES_AUTH_SUCCESS, // empty - CPROTO_RES_ACK, // empty - CPROTO_RES_INFO, // [version, [dnname1, ...]] - CPROTO_RES_FILE, // file content + CPROTO_RES_QUERY, /* {query response data} */ + CPROTO_RES_INSERT, /* {"success_msg": ...} */ + CPROTO_RES_AUTH_SUCCESS, /* empty */ + CPROTO_RES_ACK, /* empty */ + CPROTO_RES_INFO, /* [version, [dnname1, ...]] */ + CPROTO_RES_FILE, /* file content */ /* Administrative API success */ - CPROTO_ACK_ADMIN=32, // empty - CPROTO_ACK_ADMIN_DATA, // [...] + CPROTO_ACK_ADMIN=32, /* empty */ + CPROTO_ACK_ADMIN_DATA, /* [...] */ /* errors 64-69 are errors with messages */ - CPROTO_ERR_MSG=64, // {"error_msg": ...} - CPROTO_ERR_QUERY, // {"error_msg": ...} - CPROTO_ERR_INSERT, // {"error_msg": ...} - CPROTO_ERR_SERVER, // {"error_msg": ...} - CPROTO_ERR_POOL, // {"error_msg": ...} - CPROTO_ERR_USER_ACCESS, // {"error_msg": ...} - CPROTO_ERR, // empty (use for unexpected errors) - CPROTO_ERR_NOT_AUTHENTICATED, // empty - CPROTO_ERR_AUTH_CREDENTIALS, // empty - CPROTO_ERR_AUTH_UNKNOWN_DB, // empty - CPROTO_ERR_LOADING_DB, // empty - CPROTO_ERR_FILE, // empty + CPROTO_ERR_MSG=64, /* {"error_msg": ...} */ + CPROTO_ERR_QUERY, /* {"error_msg": ...} */ + CPROTO_ERR_INSERT, /* {"error_msg": ...} */ + CPROTO_ERR_SERVER, /* {"error_msg": ...} */ + CPROTO_ERR_POOL, /* {"error_msg": ...} */ + CPROTO_ERR_USER_ACCESS, /* {"error_msg": ...} */ + CPROTO_ERR, /* empty (use for unexpected errors)*/ + CPROTO_ERR_NOT_AUTHENTICATED, /* empty */ + CPROTO_ERR_AUTH_CREDENTIALS, /* empty */ + CPROTO_ERR_AUTH_UNKNOWN_DB, /* empty */ + CPROTO_ERR_LOADING_DB, /* empty */ + CPROTO_ERR_FILE, /* empty */ /* Administrative API errors */ - CPROTO_ERR_ADMIN=96, // {"error_msg": ...} - CPROTO_ERR_ADMIN_INVALID_REQUEST, // empty - CPROTO_DEFERRED=127 // deferred... + CPROTO_ERR_ADMIN=96, /* {"error_msg": ...} */ + CPROTO_ERR_ADMIN_INVALID_REQUEST, /* empty */ + CPROTO_DEFERRED=127 /* deferred... */ } cproto_server_t; typedef enum { - BPROTO_AUTH_REQUEST=128, /* (uuid, dbname, flags, version, - min_version, dbpath, buffer_path, - buffer_size, startup_time, - address, port) */ - BPROTO_FLAGS_UPDATE, // flags - BPROTO_LOG_LEVEL_UPDATE, // log_level - BPROTO_REPL_FINISHED, // empty - BPROTO_QUERY_SERVER, // (query, time_precision) - BPROTO_QUERY_UPDATE, // (query, time_precision) - BPROTO_INSERT_POOL, // {series: points, ...} - BPROTO_INSERT_SERVER, // {series: points, ...} - BPROTO_INSERT_TEST_POOL, // {series: points, ...} - BPROTO_INSERT_TEST_SERVER, // {series: points, ...} - BPROTO_INSERT_TESTED_POOL, // {series: points, ...} - BPROTO_INSERT_TESTED_SERVER, // {series: points, ...} - BPROTO_REGISTER_SERVER, // (uuid, host, port, pool) - BPROTO_DROP_SERIES, // series_name - BPROTO_REQ_GROUPS, // empty - BPROTO_ENABLE_BACKUP_MODE, // empty - BPROTO_DISABLE_BACKUP_MODE, // empty + BPROTO_AUTH_REQUEST=128, /* (uuid, dbname, flags, version, + min_version, dbpath, buffer_path, + buffer_size, startup_time, + address, port) */ + BPROTO_FLAGS_UPDATE, /* flags */ + BPROTO_LOG_LEVEL_UPDATE, /* log_level */ + BPROTO_REPL_FINISHED, /* empty */ + BPROTO_QUERY_SERVER, /* (query, time_precision) */ + BPROTO_QUERY_UPDATE, /* (query, time_precision) */ + BPROTO_INSERT_POOL, /* {series: points, ...} */ + BPROTO_INSERT_SERVER, /* {series: points, ...} */ + BPROTO_INSERT_TEST_POOL, /* {series: points, ...} */ + BPROTO_INSERT_TEST_SERVER, /* {series: points, ...} */ + BPROTO_INSERT_TESTED_POOL, /* {series: points, ...} */ + BPROTO_INSERT_TESTED_SERVER, /* {series: points, ...} */ + BPROTO_REGISTER_SERVER, /* (uuid, host, port, pool) */ + BPROTO_DROP_SERIES, /* series_name */ + BPROTO_REQ_GROUPS, /* empty */ + BPROTO_ENABLE_BACKUP_MODE, /* empty */ + BPROTO_DISABLE_BACKUP_MODE, /* empty */ } bproto_client_t; /* @@ -99,38 +99,38 @@ typedef enum { /* Mappings to client protocol messages */ /* success */ - BPROTO_RES_QUERY=CPROTO_RES_QUERY, // {query response data} + BPROTO_RES_QUERY=CPROTO_RES_QUERY, /* {query response data} */ /* errors */ - BPROTO_ERR_QUERY=CPROTO_ERR_QUERY, // {"error_msg": ...} - BPROTO_ERR_SERVER=CPROTO_ERR_SERVER, // {"error_msg": ...} - BPROTO_ERR_POOL=CPROTO_ERR_POOL, // {"error_msg": ...} + BPROTO_ERR_QUERY=CPROTO_ERR_QUERY, /* {"error_msg": ...} */ + BPROTO_ERR_SERVER=CPROTO_ERR_SERVER, /* {"error_msg": ...} */ + BPROTO_ERR_POOL=CPROTO_ERR_POOL, /* {"error_msg": ...} */ /* Back-end specific protocol messages */ /* errors */ - BPROTO_AUTH_ERR_UNKNOWN_UUID=128, // empty - BPROTO_AUTH_ERR_UNKNOWN_DBNAME, // empty - BPROTO_AUTH_ERR_INVALID_UUID, // empty - BPROTO_AUTH_ERR_VERSION_TOO_OLD, // empty - BPROTO_AUTH_ERR_VERSION_TOO_NEW, // empty - BPROTO_ERR_NOT_AUTHENTICATED, // empty - BPROTO_ERR_INSERT, // empty - BPROTO_ERR_REGISTER_SERVER, // empty - BPROTO_ERR_DROP_SERIES, // empty - BPROTO_ERR_ENABLE_BACKUP_MODE, // empty - BPROTO_ERR_DISABLE_BACKUP_MODE, // empty + BPROTO_AUTH_ERR_UNKNOWN_UUID=128, /* empty */ + BPROTO_AUTH_ERR_UNKNOWN_DBNAME, /* empty */ + BPROTO_AUTH_ERR_INVALID_UUID, /* empty */ + BPROTO_AUTH_ERR_VERSION_TOO_OLD, /* empty */ + BPROTO_AUTH_ERR_VERSION_TOO_NEW, /* empty */ + BPROTO_ERR_NOT_AUTHENTICATED, /* empty */ + BPROTO_ERR_INSERT, /* empty */ + BPROTO_ERR_REGISTER_SERVER, /* empty */ + BPROTO_ERR_DROP_SERIES, /* empty */ + BPROTO_ERR_ENABLE_BACKUP_MODE, /* empty */ + BPROTO_ERR_DISABLE_BACKUP_MODE, /* empty */ /* success */ - BPROTO_AUTH_SUCCESS=192, // empty - BPROTO_ACK_FLAGS, // empty - BPROTO_ACK_LOG_LEVEL, // empty - BPROTO_ACK_INSERT, // empty - BPROTO_ACK_REPL_FINISHED, // empty - BPROTO_ACK_REGISTER_SERVER, // empty - BPROTO_ACK_DROP_SERIES, // empty - BPROTO_ACK_ENABLE_BACKUP_MODE, // empty - BPROTO_ACK_DISABLE_BACKUP_MODE, // empty - BPROTO_RES_GROUPS // [[name, series], ...] + BPROTO_AUTH_SUCCESS=192, /* empty */ + BPROTO_ACK_FLAGS, /* empty */ + BPROTO_ACK_LOG_LEVEL, /* empty */ + BPROTO_ACK_INSERT, /* empty */ + BPROTO_ACK_REPL_FINISHED, /* empty */ + BPROTO_ACK_REGISTER_SERVER, /* empty */ + BPROTO_ACK_DROP_SERIES, /* empty */ + BPROTO_ACK_ENABLE_BACKUP_MODE, /* empty */ + BPROTO_ACK_DISABLE_BACKUP_MODE, /* empty */ + BPROTO_RES_GROUPS /* [[name, series], ...] */ } bproto_server_t; diff --git a/include/siri/net/socket.h b/include/siri/net/socket.h index 799998c1..af21d4ec 100644 --- a/include/siri/net/socket.h +++ b/include/siri/net/socket.h @@ -16,7 +16,7 @@ #include #define ADDR_BUF_SZ 54 -#define RESET_BUF_SIZE 1048576 // 1 MB +#define RESET_BUF_SIZE 1048576 /* 1 MB */ /* Warning: do not change the order! (maps to dns_req_family_map) */ enum diff --git a/include/siri/parser/queries.h b/include/siri/parser/queries.h index e40bd45c..2055217b 100644 --- a/include/siri/parser/queries.h +++ b/include/siri/parser/queries.h @@ -79,26 +79,26 @@ typedef struct query_alter_s QUERY_DEF query_alter_tp alter_tp; union query_alter_u via; - size_t n; // can be used as counter + size_t n; /* can be used as counter */ } query_alter_t; typedef struct query_count_s { QUERY_DEF - size_t n; // can be used as counter + size_t n; /* can be used as counter */ } query_count_t; typedef struct query_drop_s { QUERY_DEF - size_t n; // keep a counter for number of drops. + size_t n; /* keep a counter for number of drops. */ slist_t * shards_list; } query_drop_t; typedef struct query_list_s { QUERY_DEF - slist_t * props; // will be freed + slist_t * props; /* will be freed */ size_t limit; } query_list_t; @@ -107,14 +107,14 @@ typedef struct query_select_s QUERY_DEF size_t n; size_t nselects; - uint64_t * start_ts; // will NOT be freed - uint64_t * end_ts; // will NOT be freed + uint64_t * start_ts; /* will NOT be freed */ + uint64_t * end_ts; /* will NOT be freed */ siridb_presuf_t * presuf; char * merge_as; ct_t * result; - imap_t * points_map; // points_map for caching - slist_t * alist; // aggregation list (can be used multiple times) - slist_t * mlist; // merge aggregation list + imap_t * points_map; /* points_map for caching */ + slist_t * alist; /* aggregation list (can be used multiple times)*/ + slist_t * mlist; /* merge aggregation list */ } query_select_t; query_alter_t * query_alter_new(void); diff --git a/src/argparse/argparse.c b/src/argparse/argparse.c index 9d96a874..3b4657d0 100644 --- a/src/argparse/argparse.c +++ b/src/argparse/argparse.c @@ -17,8 +17,6 @@ #include #include #include - -// #define NDEBUG #include #define HELP_WIDTH 80 /* try to fit help within this screen width */ diff --git a/src/ctree/ctree.c b/src/ctree/ctree.c index 4dfa8565..ba888464 100644 --- a/src/ctree/ctree.c +++ b/src/ctree/ctree.c @@ -76,7 +76,8 @@ void ct_free(ct_t * ct, ct_free_cb cb) { if (ct->nodes != NULL) { - for (uint_fast16_t i = 0, end = ct->n * BLOCKSZ; i < end; i++) + uint_fast16_t i, end; + for (i = 0, end = ct->n * BLOCKSZ; i < end; i++) { if ((*ct->nodes)[i] != NULL) { @@ -281,11 +282,13 @@ int ct_items(ct_t * ct, ct_item_cb cb, void * args) ct_node_t * nd; int rc = 0; char * buffer = (char *) malloc(buffer_sz); + uint_fast16_t i, end; + if (buffer == NULL) { return -1; } - for (uint_fast16_t i = 0, end = ct->n * BLOCKSZ; !rc && i < end; i++) + for (i = 0, end = ct->n * BLOCKSZ; !rc && i < end; i++) { if ((nd = (*ct->nodes)[i]) == NULL) { @@ -307,8 +310,9 @@ int ct_values(ct_t * ct, ct_val_cb cb, void * args) { ct_node_t * nd; int rc = 0; + uint_fast16_t i, end; - for (uint_fast16_t i = 0, end = ct->n * BLOCKSZ; i < end; i++) + for (i = 0, end = ct->n * BLOCKSZ; i < end; i++) { if ((nd = (*ct->nodes)[i]) == NULL) { @@ -327,8 +331,9 @@ int ct_values(ct_t * ct, ct_val_cb cb, void * args) void ct_valuesn(ct_t * ct, size_t * n, ct_val_cb cb, void * args) { ct_node_t * nd; + uint_fast16_t i, end; - for (uint_fast16_t i = 0, end = ct->n * BLOCKSZ; *n && i < end; i++) + for (i = 0, end = ct->n * BLOCKSZ; *n && i < end; i++) { if ((nd = (*ct->nodes)[i]) == NULL) { @@ -378,8 +383,9 @@ static int CT_items( { ct_node_t * nd; int rc; + uint_fast16_t i, end; - for (uint_fast16_t i = 0, end = node->n * BLOCKSZ; i < end; i++) + for (i = 0, end = node->n * BLOCKSZ; i < end; i++) { if ((nd = (*node->nodes)[i]) == NULL) { @@ -417,8 +423,9 @@ static int CT_values( if (node->nodes != NULL) { ct_node_t * nd; + uint_fast16_t i, end; - for (uint_fast16_t i = 0, end = node->n * BLOCKSZ; i < end; i++) + for (i = 0, end = node->n * BLOCKSZ; i < end; i++) { if ((nd = (*node->nodes)[i]) == NULL) { @@ -448,8 +455,9 @@ static void CT_valuesn( if (node->nodes != NULL) { ct_node_t * nd; + uint_fast16_t i, end; - for (uint_fast16_t i = 0, end = node->n * BLOCKSZ; *n && i < end; i++) + for (i = 0, end = node->n * BLOCKSZ; *n && i < end; i++) { if ((nd = (*node->nodes)[i]) == NULL) { @@ -470,13 +478,15 @@ static int CT_add( const char * key, void * data) { - for (size_t n = 0; n < node->len; n++, key++) + size_t n; + for (n = 0; n < node->len; n++, key++) { char * pt = node->key + n; if (*key != *pt) { size_t new_sz; uint8_t k = (uint8_t) *pt; + ct_node_t * nd; /* create new nodes */ ct_nodes_t * new_nodes = @@ -487,7 +497,7 @@ static int CT_add( } /* create new nodes with rest of node pt */ - ct_node_t * nd = (*new_nodes)[k % BLOCKSZ] = + nd = (*new_nodes)[k % BLOCKSZ] = CT_node_new(pt + 1, node->len - n - 1, node->data); if (nd == NULL) { @@ -843,7 +853,7 @@ static int CT_node_resize(ct_node_t * node, uint8_t pos) ct_nodes_t * tmp; uint8_t diff = pos - node->offset - node->n + 1; uint8_t oldn = node->n; - node->n += diff; // assert node->n > 0 + node->n += diff; /* assert node->n > 0 */ tmp = (ct_nodes_t *) realloc( node->nodes, node->n * sizeof(ct_nodes_t)); @@ -870,7 +880,8 @@ static void CT_free(ct_node_t * node, ct_free_cb cb) { if (node->nodes != NULL) { - for (uint_fast16_t i = 0, end = node->n * BLOCKSZ; i < end; i++) + uint_fast16_t i, end; + for (i = 0, end = node->n * BLOCKSZ; i < end; i++) { if ((*node->nodes)[i] != NULL) { diff --git a/src/expr/expr.c b/src/expr/expr.c index fad9443e..b7c40a63 100644 --- a/src/expr/expr.c +++ b/src/expr/expr.c @@ -48,9 +48,9 @@ static int64_t expr_factor(const char ** expression) } else if (**expression == '(') { - (*expression)++; // '(' + (*expression)++; /* '(' */ int64_t result = expr_expression(expression); - (*expression)++; // ')' + (*expression)++; /* ')' */ return result; } else if (**expression == '-') @@ -58,15 +58,16 @@ static int64_t expr_factor(const char ** expression) (*expression)++; return -expr_factor(expression); } - return 0; // error + return 0; /* error */ } static int64_t expr_term(const char ** expression) { int64_t result = expr_factor(expression); int64_t temp; + int i; - for (int i = 1; i;) + for (i = 1; i;) switch (*(*expression)) { case '*': diff --git a/src/imap/imap.c b/src/imap/imap.c index 9435227e..7271c9b6 100644 --- a/src/imap/imap.c +++ b/src/imap/imap.c @@ -67,10 +67,11 @@ void imap_free(imap_t * imap, imap_free_cb cb) if (imap->len) { imap_node_t * nd; + uint_fast8_t i; if (cb == NULL) { - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -82,7 +83,7 @@ void imap_free(imap_t * imap, imap_free_cb cb) } else { - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -257,8 +258,9 @@ int imap_walk(imap_t * imap, imap_cb cb, void * data) if (imap->len) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -288,8 +290,9 @@ void imap_walkn(imap_t * imap, size_t * n, imap_cb cb, void * data) if (imap->len) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; *n && i < IMAP_NODE_SZ; i++) + for (i = 0; *n && i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -320,8 +323,9 @@ slist_t * imap_slist(imap_t * imap) if (imap->slist != NULL && imap->len) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -390,8 +394,9 @@ slist_t * imap_2slist_ref(imap_t * imap) if (imap->slist != NULL && imap->len) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = imap->nodes + i; @@ -410,7 +415,8 @@ slist_t * imap_2slist_ref(imap_t * imap) } else { - for (size_t i = 0; i < imap->slist->len; i++) + size_t i; + for (i = 0; i < imap->slist->len; i++) { slist_object_incref(imap->slist->data[i]); } @@ -443,8 +449,9 @@ void imap_union_ref( { imap_node_t * dest_nd; imap_node_t * imap_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; imap_nd = imap->nodes + i; @@ -512,8 +519,9 @@ void imap_intersection_ref( imap_node_t * dest_nd; imap_node_t * imap_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; imap_nd = imap->nodes + i; @@ -578,8 +586,9 @@ void imap_difference_ref( { imap_node_t * dest_nd; imap_node_t * imap_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; imap_nd = imap->nodes + i; @@ -647,8 +656,9 @@ void imap_symmetric_difference_ref( { imap_node_t * dest_nd; imap_node_t * imap_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; imap_nd = imap->nodes + i; @@ -706,8 +716,9 @@ void imap_symmetric_difference_ref( static void IMAP_node_free(imap_node_t * node) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { if ((nd = node->nodes + i)->nodes != NULL) { @@ -721,8 +732,9 @@ static void IMAP_node_free(imap_node_t * node) static void IMAP_node_free_cb(imap_node_t * node, imap_free_cb cb) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = node->nodes + i; @@ -871,8 +883,9 @@ static void * IMAP_pop(imap_node_t * node, uint64_t id) static void IMAP_walk(imap_node_t * node, imap_cb cb, void * data, int * rc) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = node->nodes + i; @@ -891,8 +904,9 @@ static void IMAP_walk(imap_node_t * node, imap_cb cb, void * data, int * rc) static void IMAP_walkn(imap_node_t * node, imap_cb cb, void * data, size_t * n) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; *n && i < IMAP_NODE_SZ; i++) + for (i = 0; *n && i < IMAP_NODE_SZ; i++) { nd = node->nodes + i; @@ -911,8 +925,9 @@ static void IMAP_walkn(imap_node_t * node, imap_cb cb, void * data, size_t * n) static void IMAP_2slist(imap_node_t * node, slist_t * slist) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = node->nodes + i; @@ -931,8 +946,9 @@ static void IMAP_2slist(imap_node_t * node, slist_t * slist) static void IMAP_2slist_ref(imap_node_t * node, slist_t * slist) { imap_node_t * nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { nd = node->nodes + i; @@ -953,8 +969,9 @@ static void IMAP_union_ref(imap_node_t * dest, imap_node_t * node) { imap_node_t * dest_nd; imap_node_t * node_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; node_nd = node->nodes + i; @@ -1003,8 +1020,9 @@ static void IMAP_intersection_ref( { imap_node_t * dest_nd; imap_node_t * node_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; node_nd = node->nodes + i; @@ -1058,8 +1076,9 @@ static void IMAP_difference_ref( { imap_node_t * dest_nd; imap_node_t * node_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; node_nd = node->nodes + i; @@ -1113,8 +1132,9 @@ static void IMAP_symmetric_difference_ref( { imap_node_t * dest_nd; imap_node_t * node_nd; + uint_fast8_t i; - for (uint_fast8_t i = 0; i < IMAP_NODE_SZ; i++) + for (i = 0; i < IMAP_NODE_SZ; i++) { dest_nd = dest->nodes + i; node_nd = node->nodes + i; diff --git a/src/logger/logger.c b/src/logger/logger.c index 021ca1fe..4c825eb4 100644 --- a/src/logger/logger.c +++ b/src/logger/logger.c @@ -24,14 +24,14 @@ logger_t Logger = { #define LOGGER_CHR_MAP "DIWECU" -#define KNRM "\x1B[0m" // normal -#define KRED "\x1B[31m" // error -#define KGRN "\x1B[32m" // info -#define KYEL "\x1B[33m" // warning -#define KBLU "\x1B[34m" // -- not used -- -#define KMAG "\x1B[35m" // critical -#define KCYN "\x1B[36m" // debug -#define KWHT "\x1B[37m" // -- not used -- +#define KNRM "\x1B[0m" /* normal */ +#define KRED "\x1B[31m" /* error */ +#define KGRN "\x1B[32m" /* info */ +#define KYEL "\x1B[33m" /* warning */ +#define KBLU "\x1B[34m" /* -- not used -- */ +#define KMAG "\x1B[35m" /* critical */ +#define KCYN "\x1B[36m" /* debug */ +#define KWHT "\x1B[37m" /* -- not used -- */ const char * LOGGER_LEVEL_NAMES[LOGGER_NUM_LEVELS] = {"debug", "info", "warning", "error", "critical"}; diff --git a/src/owcrypt/owcrypt.c b/src/owcrypt/owcrypt.c index 1a9ac283..3d120991 100644 --- a/src/owcrypt/owcrypt.c +++ b/src/owcrypt/owcrypt.c @@ -57,11 +57,11 @@ static void owcrypt1( * char[OWCRYPT_SZ] encrypted; * owcrypt("my_password", "saltsalt$1", encrypted); * - * // Checking can be done like this: + * # Checking can be done like this: * char[OWCRYPT_SZ] pw; * owcrypt("pasword_to_check", encrypted, pw"); * if (strcmp(pw, encrypted) === 0) { - * // valid + * # valid * } * * Parameters: diff --git a/src/siri/admin/client.c b/src/siri/admin/client.c index 7b4783d1..af6ff0ea 100644 --- a/src/siri/admin/client.c +++ b/src/siri/admin/client.c @@ -21,7 +21,7 @@ #include #include -// 15 seconds +/* 15 seconds */ #define CLIENT_REQUEST_TIMEOUT 15000 #define CLIENT_FLAGS_TIMEOUT 1 #define CLIENT_FLAGS_NO_ROLLBACK 2 @@ -632,7 +632,8 @@ static void CLIENT_on_file_database( qp_obj_t qp_uuid; siridb_t * siridb; int rc; - char fn[strlen(adm_client->dbpath) + 13]; // 13 = strlen("database.dat")+1 + /* 13 = strlen("database.dat")+1 */ + char fn[strlen(adm_client->dbpath) + 13]; sprintf(fn, "%sdatabase.dat", adm_client->dbpath); qp_unpacker_init(&unpacker, pkg->data, pkg->len); @@ -720,7 +721,8 @@ static void CLIENT_on_file_servers( qp_unpacker_t unpacker; qp_types_t tp; int rc, n, close_num; - char fn[strlen(adm_client->dbpath) + 12]; // 12 = strlen("servers.dat") + 1 + /* 12 = strlen("servers.dat") + 1 */ + char fn[strlen(adm_client->dbpath) + 12]; sprintf(fn, "%sservers.dat", adm_client->dbpath); fp = fopen(fn, "w"); @@ -802,7 +804,8 @@ static void CLIENT_on_file_groups( sirinet_pkg_t * pkg) { FILE * fp; - char fn[strlen(adm_client->dbpath) + 11]; // 11 = strlen("groups.dat") + 1 + /* 11 = strlen("groups.dat") + 1 */ + char fn[strlen(adm_client->dbpath) + 11]; sprintf(fn, "%sgroups.dat", adm_client->dbpath); fp = fopen(fn, "w"); @@ -843,7 +846,8 @@ static void CLIENT_on_file_users( sirinet_pkg_t * pkg) { FILE * fp; - char fn[strlen(adm_client->dbpath) + 10]; // 10 = strlen("users.dat") + 1 + /* 10 = strlen("users.dat") + 1 */ + char fn[strlen(adm_client->dbpath) + 10]; sprintf(fn, "%susers.dat", adm_client->dbpath); fp = fopen(fn, "w"); diff --git a/src/siri/admin/request.c b/src/siri/admin/request.c index 6a999b36..aad90a39 100644 --- a/src/siri/admin/request.c +++ b/src/siri/admin/request.c @@ -802,7 +802,8 @@ static cproto_server_t ADMIN_on_new_replica_or_pool( if (siri_admin_client_request( pid, port, - (req == ADMIN_NEW_POOL) ? -1 : qp_pool.via.int64, // -1 = new pool + /* -1 = new pool */ + (req == ADMIN_NEW_POOL) ? -1 : qp_pool.via.int64, &uuid, &qp_host, &qp_username, diff --git a/src/siri/backup.c b/src/siri/backup.c index 3b3efd3b..628f33e1 100644 --- a/src/siri/backup.c +++ b/src/siri/backup.c @@ -211,6 +211,7 @@ static void BACKUP_walk(siridb_t * siridb, void * args __attribute__((unused))) if (SIRI_OPTIMZE_IS_PAUSED) { + size_t i; siridb_shard_t * shard; /* @@ -225,7 +226,7 @@ static void BACKUP_walk(siridb_t * siridb, void * args __attribute__((unused))) "Cannot create shard list so not all shard files " "will be closed in backup mode."); } - else for (size_t i = 0; i < shard_list->len; i++) + else for (i = 0; i < shard_list->len; i++) { shard = (siridb_shard_t *) shard_list->data[i]; diff --git a/src/siri/db/access.c b/src/siri/db/access.c index 949c21c9..cc00dacf 100644 --- a/src/siri/db/access.c +++ b/src/siri/db/access.c @@ -41,7 +41,8 @@ static const siridb_access_repr_t access_map[ACCESS_SIZE] = { */ uint32_t siridb_access_from_strn(const char * str, size_t n) { - for (int i = 0; i < ACCESS_SIZE; i++) + int i; + for (i = 0; i < ACCESS_SIZE; i++) { if (strncmp(access_map[i].repr, str, n) == 0) { @@ -78,8 +79,9 @@ uint32_t siridb_access_from_children(cleri_children_t * children) void siridb_access_to_str(char * str, uint32_t access_bit) { char * pt = str; + int i; - for (int i = 0; i < ACCESS_SIZE && access_bit; i++) + for (i = 0; i < ACCESS_SIZE && access_bit; i++) { if ((access_bit & access_map[i].access_bit) == access_map[i].access_bit) { diff --git a/src/siri/db/aggregate.c b/src/siri/db/aggregate.c index 2fdfd78d..bfc55d91 100644 --- a/src/siri/db/aggregate.c +++ b/src/siri/db/aggregate.c @@ -177,7 +177,8 @@ static int aggr_last( */ void siridb_init_aggregates(void) { - for (uint_fast16_t i = 0; i < F_OFFSET; i++) + uint_fast16_t i; + for (i = 0; i < F_OFFSET; i++) { AGGREGATES[i] = NULL; } @@ -454,7 +455,8 @@ slist_t * siridb_aggregate_list(cleri_children_t * children, char * err_msg) */ void siridb_aggregate_list_free(slist_t * alist) { - for (size_t i = 0; i < alist->len; i++) + size_t i; + for (i = 0; i < alist->len; i++) { AGGREGATE_free(alist->data[i]); } @@ -812,10 +814,10 @@ static int AGGREGATE_regex_cmp(siridb_aggr_t * aggr, char * val) aggr->regex, (PCRE2_SPTR8) val, strlen(val), - 0, // start looking at this point - 0, // OPTIONS + 0, /* start looking at this point */ + 0, /* OPTIONS */ aggr->match_data, - 0); // length of sub_str_vec + 0); /* length of sub_str_vec */ return aggr->filter_opr == CEXPR_EQ ? ret >= 0 : ret < 0; } @@ -872,7 +874,7 @@ static siridb_points_t * AGGREGATE_filter( i < source->len; i++, spt++) { - if (value.str != NULL // NULL is a regular expression + if (value.str != NULL /* NULL is a regular expression */ ? cexpr_str_cmp( aggr->filter_opr, spt->val.str, value.str) @@ -1263,7 +1265,8 @@ static int aggr_max( if (points->tp == TP_INT) { int64_t max = points->data->val.int64; - for (size_t i = 1; i < points->len; i++) + size_t i; + for (i = 1; i < points->len; i++) { if ((points->data + i)->val.int64 > max) { @@ -1275,7 +1278,8 @@ static int aggr_max( else { double max = points->data->val.real; - for (size_t i = 1; i < points->len; i++) + size_t i; + for (i = 1; i < points->len; i++) { if ((points->data + i)->val.real > max) { @@ -1299,6 +1303,7 @@ static int aggr_mean( #endif double sum = 0.0; + size_t i; switch (points->tp) { @@ -1307,14 +1312,14 @@ static int aggr_mean( return -1; case TP_INT: - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { sum += (points->data + i)->val.int64; } break; case TP_DOUBLE: - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { sum += (points->data + i)->val.real; } @@ -1463,7 +1468,8 @@ static int aggr_min( if (points->tp == TP_INT) { int64_t min = points->data->val.int64; - for (size_t i = 1; i < points->len; i++) + size_t i; + for (i = 1; i < points->len; i++) { if ((points->data + i)->val.int64 < min) { @@ -1475,7 +1481,8 @@ static int aggr_min( else { double min = points->data->val.real; - for (size_t i = 1; i < points->len; i++) + size_t i; + for (i = 1; i < points->len; i++) { if ((points->data + i)->val.real < min) { @@ -1537,7 +1544,8 @@ static int aggr_sum( { int64_t sum = 0; int64_t tmp; - for (size_t i = 0; i < points->len; i++) + size_t i; + for (i = 0; i < points->len; i++) { tmp = (points->data + i)->val.int64; if ((tmp > 0 && sum > LLONG_MAX - tmp) || @@ -1555,7 +1563,8 @@ static int aggr_sum( case TP_DOUBLE: { double sum = 0.0; - for (size_t i = 0; i < points->len; i++) + size_t i; + for (i = 0; i < points->len; i++) { sum += (points->data + i)->val.real; } diff --git a/src/siri/db/db.c b/src/siri/db/db.c index ee5234b6..67b9ca0b 100644 --- a/src/siri/db/db.c +++ b/src/siri/db/db.c @@ -127,6 +127,7 @@ siridb_t * siridb_new(const char * dbpath, int lock_flags) siridb_t * siridb; char err_msg[512]; int rc; + size_t i; if (!len || dbpath[len - 1] != '/') { @@ -327,7 +328,7 @@ siridb_t * siridb_new(const char * dbpath, int lock_flags) return NULL; } - for (size_t i = 0; i < slist->len; i++) + for (i = 0; i < slist->len; i++) { siridb_series_update_props(siridb, (siridb_series_t * )slist->data[i]); } diff --git a/src/siri/db/ffile.c b/src/siri/db/ffile.c index 995bca7b..c366521c 100644 --- a/src/siri/db/ffile.c +++ b/src/siri/db/ffile.c @@ -22,8 +22,8 @@ #include #include -#define FFILE_DEFAULT_SIZE 104857600 // 100 MB -#define FFILE_NUMBERS 9 // how much numbers are used to generate the file. +#define FFILE_DEFAULT_SIZE 104857600 /* 100 MB */ +#define FFILE_NUMBERS 9 /* how much numbers are used to generate the file. */ /* * Open the fifo file. (set both the file pointer and file descriptor diff --git a/src/siri/db/fifo.c b/src/siri/db/fifo.c index ca5de49b..11f0eed9 100644 --- a/src/siri/db/fifo.c +++ b/src/siri/db/fifo.c @@ -346,6 +346,7 @@ static int FIFO_init(siridb_fifo_t * fifo) struct dirent ** fifo_list; char * fn; int total = scandir(fifo->path, &fifo_list, NULL, alphasort); + int n; if (total < 0) { @@ -354,7 +355,7 @@ static int FIFO_init(siridb_fifo_t * fifo) ERR_C } - for (int n = 0; n < total; n++) + for (n = 0; n < total; n++) { if (siridb_ffile_check_fn(fifo_list[n]->d_name)) { diff --git a/src/siri/db/forward.c b/src/siri/db/forward.c index 8bd15647..1b4069f9 100644 --- a/src/siri/db/forward.c +++ b/src/siri/db/forward.c @@ -36,6 +36,9 @@ siridb_forward_t * siridb_forward_new(siridb_t * siridb) } else { + uint32_t psize; + size_t n; + forward->free_cb = FORWARD_free; forward->ref = 1; /* used as reference on (siri_async_t) handle */ forward->siridb = siridb; @@ -50,9 +53,9 @@ siridb_forward_t * siridb_forward_new(siridb_t * siridb) * Allocate packers for sending data to pools. we allocate smaller * sizes in case we have a lot of pools. */ - uint32_t psize = QP_SUGGESTED_SIZE / ((size / 4) + 1); + psize = QP_SUGGESTED_SIZE / ((size / 4) + 1); - for (size_t n = 0; n < size; n++) + for (n = 0; n < size; n++) { if (n == siridb->server->pool) { @@ -77,8 +80,10 @@ siridb_forward_t * siridb_forward_new(siridb_t * siridb) */ void siridb_forward_free(siridb_forward_t * forward) { + size_t n; + /* free packer */ - for (size_t n = 0; n < forward->size; n++) + for (n = 0; n < forward->size; n++) { if (forward->packer[n] != NULL) { @@ -109,15 +114,15 @@ void siridb_forward_points_to_pools(uv_async_t * handle) (sirinet_promises_cb) FORWARD_on_response, handle, NULL); + int pool_count = 0; + uint16_t n; if (promises == NULL) { return; /* signal is raised */ } - int pool_count = 0; - - for (uint16_t n = 0; n < forward->size; n++) + for (n = 0; n < forward->size; n++) { if ( forward->packer[n] == NULL || forward->packer[n]->len == sizeof(sirinet_pkg_t) + 1) @@ -174,8 +179,9 @@ static void FORWARD_on_response(slist_t * promises, uv_async_t * handle) sirinet_pkg_t * pkg; sirinet_promise_t * promise; siridb_forward_t * forward = (siridb_forward_t *) handle->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; if (promise == NULL) diff --git a/src/siri/db/group.c b/src/siri/db/group.c index d2986206..cb3f8cbd 100644 --- a/src/siri/db/group.c +++ b/src/siri/db/group.c @@ -168,8 +168,9 @@ void siridb_group_cleanup(siridb_group_t * group) { size_t dropped = 0; siridb_series_t * series; + size_t i; - for (size_t i = 0; i < group->series->len; i++) + for (i = 0; i < group->series->len; i++) { series = (siridb_series_t *) group->series->data[i]; @@ -199,10 +200,10 @@ int siridb_group_test_series(siridb_group_t * group, siridb_series_t * series) group->regex, (PCRE2_SPTR8) series->name, series->name_len, - 0, // start looking at this point - 0, // OPTIONS + 0, /* start looking at this point */ + 0, /* OPTIONS */ group->match_data, - NULL); // length of sub_str_vec + NULL); /* length of sub_str_vec */ if (rc >= 0) { @@ -241,6 +242,7 @@ int siridb_group_update_expression( pcre2_code * new_regex; pcre2_match_data * new_regex_match_data; siridb_series_t * series; + size_t i; if (new_source == NULL) { @@ -271,7 +273,7 @@ int siridb_group_update_expression( group->regex = new_regex; group->match_data = new_regex_match_data; - for (size_t i = 0; i < group->series->len; i++) + for (i = 0; i < group->series->len; i++) { series = (siridb_series_t *) group->series->data[i]; siridb_series_decref(series); @@ -355,6 +357,8 @@ int siridb_group_is_remote_prop(uint32_t prop) */ void siridb__group_free(siridb_group_t * group) { + size_t i; + #if DEBUG log_debug("Free group: '%s'", group->name); #endif @@ -364,7 +368,7 @@ void siridb__group_free(siridb_group_t * group) if (group->series != NULL) { siridb_series_t * series; - for (size_t i = 0; i < group->series->len; i++) + for (i = 0; i < group->series->len; i++) { series = (siridb_series_t *) group->series->data[i]; siridb_series_decref(series); diff --git a/src/siri/db/groups.c b/src/siri/db/groups.c index ad398bb2..2689746d 100644 --- a/src/siri/db/groups.c +++ b/src/siri/db/groups.c @@ -47,8 +47,8 @@ #define SIRIDB_GROUPS_SCHEMA 1 #define SIRIDB_GROUPS_FN "groups.dat" -#define GROUPS_LOOP_SLEEP 2 // 2 seconds -#define GROUPS_LOOP_DEEP 15 // x times -> 30 seconds (used when re-indexing) +#define GROUPS_LOOP_SLEEP 2 /* 2 seconds */ +#define GROUPS_LOOP_DEEP 15 /* x times -> 30 seconds. used when re-indexing */ #define GROUPS_RE_BATCH_SZ 1000 #define CALC_BATCH_SIZE(sz) GROUPS_RE_BATCH_SZ /((sz / 5 ) + 1) + 1; @@ -78,7 +78,7 @@ siridb_groups_t * siridb_groups_new(siridb_t * siridb) } else { - groups->ref = 2; // for the main thread and for the groups thread + groups->ref = 2; /* for the main thread and for the groups thread */ groups->fn = NULL; groups->groups = ct_new(); groups->nseries = slist_new(SLIST_DEFAULT_SIZE); @@ -376,6 +376,8 @@ static int GROUPS_nseries( static void GROUPS_free(siridb_groups_t * groups) { + size_t i; + #if DEBUG log_debug("Free groups"); #endif @@ -384,7 +386,7 @@ static void GROUPS_free(siridb_groups_t * groups) if (groups->nseries != NULL) { siridb_series_t * series; - for (size_t i = 0; i < groups->nseries->len; i++) + for (i = 0; i < groups->nseries->len; i++) { series = (siridb_series_t *) groups->nseries->data[i]; siridb_series_decref(series); @@ -400,7 +402,7 @@ static void GROUPS_free(siridb_groups_t * groups) if (groups->ngroups != NULL) { siridb_group_t * group; - for (size_t i = 0; i < groups->ngroups->len; i++) + for (i = 0; i < groups->ngroups->len; i++) { group = (siridb_group_t *) groups->ngroups->data[i]; siridb_group_decref(group); @@ -579,7 +581,7 @@ static void GROUPS_init_series(siridb_t * siridb) { uv_mutex_unlock(&groups->mutex); - usleep(10000); // 10ms + usleep(10000); /* 10ms */ uv_mutex_lock(&groups->mutex); @@ -596,16 +598,17 @@ static void GROUPS_init_series(siridb_t * siridb) */ static void GROUPS_init_groups(siridb_t * siridb) { + siridb_groups_t * groups = siridb->groups; + siridb_group_t * group; + slist_t * series_list; + siridb_series_t * series; + size_t i; + #if DEBUG /* do not run this function when no groups need initialization */ assert (siridb->groups->ngroups->len); #endif - siridb_groups_t * groups = siridb->groups; - siridb_group_t * group; - - slist_t * series_list; - siridb_series_t * series; uv_mutex_lock(&siridb->series_mutex); series_list = (groups->nseries->len) ? @@ -635,7 +638,7 @@ static void GROUPS_init_groups(siridb_t * siridb) /* remove INIT flag from group */ group->flags &= ~GROUP_FLAG_INIT; - for (size_t i = 0; i < series_list->len; i++) + for (i = 0; i < series_list->len; i++) { series = (siridb_series_t *) series_list->data[i]; @@ -645,7 +648,7 @@ static void GROUPS_init_groups(siridb_t * siridb) { uv_mutex_unlock(&groups->mutex); - usleep(10000); // 10ms + usleep(10000); /* 10ms */ uv_mutex_lock(&groups->mutex); } @@ -656,14 +659,14 @@ static void GROUPS_init_groups(siridb_t * siridb) uv_mutex_unlock(&groups->mutex); - usleep(10000); // 10ms + usleep(10000); /* 10ms */ uv_mutex_lock(&groups->mutex); } uv_mutex_unlock(&groups->mutex); - for (size_t i = 0; i < series_list->len; i++) + for (i = 0; i < series_list->len; i++) { series = (siridb_series_t *) series_list->data[i]; siridb_series_decref(series); @@ -714,7 +717,7 @@ static void GROUPS_cleanup(siridb_groups_t * groups) siridb_group_decref(group); - usleep(10000); // 10ms + usleep(10000); /* 10ms */ } slist_free(groups_list); diff --git a/src/siri/db/initsync.c b/src/siri/db/initsync.c index b8c8ffdd..91a92362 100644 --- a/src/siri/db/initsync.c +++ b/src/siri/db/initsync.c @@ -25,9 +25,9 @@ #include #include -#define INITSYNC_SLEEP 100 // 100 milliseconds * active tasks -#define INITSYNC_TIMEOUT 120000 // 2 minutes -#define INITSYNC_RETRY 30000 // 30 seconds +#define INITSYNC_SLEEP 100 /* 100 milliseconds * active tasks */ +#define INITSYNC_TIMEOUT 120000 /* 2 minutes */ +#define INITSYNC_RETRY 30000 /* 30 seconds */ #define INITSYC_FN ".initsync" void siridb_initsync_fopen(siridb_initsync_t * initsync, const char * opentype); diff --git a/src/siri/db/insert.c b/src/siri/db/insert.c index 8aead544..571831a8 100644 --- a/src/siri/db/insert.c +++ b/src/siri/db/insert.c @@ -29,8 +29,8 @@ #include #define MAX_INSERT_MSG 236 -#define INSERT_TIMEOUT 300000 // 5 minutes -#define INSERT_AT_ONCE 3000 // one point counts as 1, a series as 100 +#define INSERT_TIMEOUT 300000 /* 5 minutes */ +#define INSERT_AT_ONCE 3000 /* one point counts as 1, a series as 100 */ #define WEIGHT_SERIES 50 #define WEIGHT_NEW_SERIES 100 @@ -137,8 +137,10 @@ const char * siridb_insert_err_msg(siridb_insert_err_t err) */ void siridb_insert_free(siridb_insert_t * insert) { + size_t n; + /* free packer */ - for (size_t n = 0; n < insert->packer_size; n++) + for (n = 0; n < insert->packer_size; n++) { if (insert->packer[n] != NULL) { @@ -218,6 +220,9 @@ siridb_insert_t * siridb_insert_new( } else { + size_t n; + uint32_t psize; + insert->free_cb = INSERT_free; insert->ref = 1; /* used as reference on (siri_async_t) handle */ @@ -241,9 +246,9 @@ siridb_insert_t * siridb_insert_new( * Allocate packers for sending data to pools. we allocate smaller * sizes in case we have a lot of pools. */ - uint32_t psize = QP_SUGGESTED_SIZE / ((siridb->pools->len / 4) + 1); + psize = QP_SUGGESTED_SIZE / ((siridb->pools->len / 4) + 1); - for (size_t n = 0; n < siridb->pools->len; n++) + for (n = 0; n < siridb->pools->len; n++) { if ((insert->packer[n] = sirinet_packer_new(psize)) == NULL) { @@ -347,8 +352,8 @@ int insert_init_backend_local( handle->data = ilocal; - qp_next(&ilocal->unpacker, NULL); // map - qp_next(&ilocal->unpacker, &ilocal->qp_series_name); // first series or end + qp_next(&ilocal->unpacker, NULL); /* map */ + qp_next(&ilocal->unpacker, &ilocal->qp_series_name); /* first series/end */ siridb_tasks_inc(siridb->tasks); siridb->insert_tasks++; @@ -384,8 +389,10 @@ static void INSERT_on_response(slist_t * promises, uv_async_t * handle) if (packer != NULL) { cproto_server_t tp = CPROTO_RES_INSERT; + size_t i; + sirinet_pkg_t * response_pkg; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; if (siri_err || promise == NULL) @@ -437,7 +444,7 @@ static void INSERT_on_response(slist_t * promises, uv_async_t * handle) (const unsigned char *) msg, (n < MAX_INSERT_MSG) ? n : MAX_INSERT_MSG); - sirinet_pkg_t * response_pkg = sirinet_packer2pkg( + response_pkg = sirinet_packer2pkg( packer, insert->pid, tp); @@ -520,10 +527,10 @@ static int8_t INSERT_local_work( siridb->series, (const char *) qp_series_name->via.raw); - qp_next(unpacker, NULL); // array open - qp_next(unpacker, NULL); // first point array2 - qp_next(unpacker, &qp_series_ts); // first ts - qp_next(unpacker, &qp_series_val); // first val + qp_next(unpacker, NULL); /* array open */ + qp_next(unpacker, NULL); /* first point array2 */ + qp_next(unpacker, &qp_series_ts); /* first ts */ + qp_next(unpacker, &qp_series_val); /* first val */ if (series == NULL) { @@ -597,8 +604,8 @@ static int8_t INSERT_local_work( if (tp == QP_ARRAY2) do { - qp_next(unpacker, &qp_series_ts); // ts - qp_next(unpacker, &qp_series_val); // val + qp_next(unpacker, &qp_series_ts); /* ts */ + qp_next(unpacker, &qp_series_val); /* val */ if (series->tp == TP_STRING) { @@ -699,10 +706,10 @@ static int INSERT_local_work_test( /* save pointer position and read series type */ pt = unpacker->pt; - qp_next(unpacker, NULL); // array open - qp_next(unpacker, NULL); // first point array2 - qp_next(unpacker, NULL); // first ts - qp_next(unpacker, &qp_series_val); // first val + qp_next(unpacker, NULL); /* array open */ + qp_next(unpacker, NULL); /* first point array2 */ + qp_next(unpacker, NULL); /* first ts */ + qp_next(unpacker, &qp_series_val); /* first val */ /* restore pointer position */ unpacker->pt = pt; @@ -751,16 +758,16 @@ static int INSERT_local_work_test( * Skip this series since it will forwarded to the correct * pool by the replica server. */ - qp_skip_next(unpacker); // array + qp_skip_next(unpacker); /* array */ qp_next(unpacker, qp_series_name); continue; /* expected to be 0 */ } } - qp_next(unpacker, NULL); // array open - qp_next(unpacker, NULL); // first point array2 - qp_next(unpacker, &qp_series_ts); // first ts - qp_next(unpacker, &qp_series_val); // first val + qp_next(unpacker, NULL); /* array open */ + qp_next(unpacker, NULL); /* first point array2 */ + qp_next(unpacker, &qp_series_ts); /* first ts */ + qp_next(unpacker, &qp_series_val); /* first val */ ts = (uint64_t *) &qp_series_ts.via.int64; SERIES_UPDATE_TS(series) @@ -815,8 +822,8 @@ static int INSERT_local_work_test( if (tp == QP_ARRAY2) do { - qp_next(unpacker, &qp_series_ts); // ts - qp_next(unpacker, &qp_series_val); // val + qp_next(unpacker, &qp_series_ts); /* ts */ + qp_next(unpacker, &qp_series_val); /* val */ if (series->tp == TP_STRING) { @@ -1055,8 +1062,8 @@ static int INSERT_init_local( handle->data = ilocal; - qp_next(&ilocal->unpacker, NULL); // map - qp_next(&ilocal->unpacker, &ilocal->qp_series_name); // first series or end + qp_next(&ilocal->unpacker, NULL); /* map */ + qp_next(&ilocal->unpacker, &ilocal->qp_series_name); /* first series/end */ siridb_tasks_inc(siridb->tasks); siridb->insert_tasks++; @@ -1086,15 +1093,15 @@ static void INSERT_points_to_pools(uv_async_t * handle) (sirinet_promises_cb) INSERT_on_response, handle, NULL); + int pool_count = 0; + uint16_t n; if (promises == NULL) { return; /* signal is raised */ } - int pool_count = 0; - - for (uint16_t n = 0; n < insert->packer_size; n++) + for (n = 0; n < insert->packer_size; n++) { if (insert->packer[n]->len == sizeof(sirinet_pkg_t) + 1) { diff --git a/src/siri/db/points.c b/src/siri/db/points.c index 417d35f1..8ce32992 100644 --- a/src/siri/db/points.c +++ b/src/siri/db/points.c @@ -127,7 +127,8 @@ siridb_points_t * siridb_points_copy(siridb_points_t * points) } if (points->tp == TP_STRING) { - for (size_t i = 0; i < points->len; ++i) + size_t i; + for (i = 0; i < points->len; ++i) { (cpoints->data + i)->val.str = strdup((points->data + i)->val.str); @@ -144,7 +145,8 @@ void siridb_points_free(siridb_points_t * points) { if (points->tp == TP_STRING) { - for (size_t i = 0; i < points->len; ++i) + size_t i; + for (i = 0; i < points->len; ++i) { free((points->data + i)->val.str); } @@ -189,11 +191,12 @@ int siridb_points_pack(siridb_points_t * points, qp_packer_t * packer) qp_add_type(packer, QP_ARRAY_OPEN); if (points->len) { + size_t i; siridb_point_t * point = points->data; switch (points->tp) { case TP_INT: - for (size_t i = 0; i < points->len; i++, point++) + for (i = 0; i < points->len; i++, point++) { qp_add_type(packer, QP_ARRAY2); qp_add_int64(packer, (int64_t) point->ts); @@ -201,7 +204,7 @@ int siridb_points_pack(siridb_points_t * points, qp_packer_t * packer) } break; case TP_DOUBLE: - for (size_t i = 0; i < points->len; i++, point++) + for (i = 0; i < points->len; i++, point++) { qp_add_type(packer, QP_ARRAY2); qp_add_int64(packer, (int64_t) point->ts); @@ -209,7 +212,7 @@ int siridb_points_pack(siridb_points_t * points, qp_packer_t * packer) } break; case TP_STRING: - for (size_t i = 0; i < points->len; i++, point++) + for (i = 0; i < points->len; i++, point++) { qp_add_type(packer, QP_ARRAY2); qp_add_int64(packer, (int64_t) point->ts); @@ -226,7 +229,8 @@ int siridb_points_pack(siridb_points_t * points, qp_packer_t * packer) void siridb_points_ts_correction(siridb_points_t * points, double factor) { siridb_point_t * point = points->data; - for (size_t i = 0; i < points->len; i++, point++) + size_t i; + for (i = 0; i < points->len; i++, point++) { point->ts *= factor; } @@ -658,15 +662,17 @@ unsigned char * siridb_points_raw_string( uint_fast32_t n = end - start; size_t * sizes = (size_t *) malloc(sizeof(size_t) * n); + size_t * psz = sizes; + unsigned char * pdata; + unsigned char * cdata; + uint_fast32_t i; + if (sizes == NULL) { return NULL; } - size_t * psz = sizes; - unsigned char * pdata; - - for (uint_fast32_t i = start; i < end; ++i, ++psz) + for (i = start; i < end; ++i, ++psz) { *psz = strlen(points->data[i].val.str) + 1; *size += *psz; @@ -681,8 +687,7 @@ unsigned char * siridb_points_raw_string( /* when uncompressed, time-stamp size is not included */ *size += n * ts_sz; - unsigned char * cdata = (unsigned char *) calloc( - *size, sizeof(unsigned char)); + cdata = (unsigned char *) calloc(*size, sizeof(unsigned char)); if (cdata == NULL) { free(sizes); @@ -695,7 +700,7 @@ unsigned char * siridb_points_raw_string( switch (ts_sz) { case sizeof(uint32_t): - for (uint_fast32_t i = start; i < end; ++i) + for (i = start; i < end; ++i) { uint32_t ts = points->data[i].ts; memcpy(pdata, &ts, sizeof(uint32_t)); @@ -703,7 +708,7 @@ unsigned char * siridb_points_raw_string( } break; case sizeof(uint64_t): - for (uint_fast32_t i = start; i < end; ++i) + for (i = start; i < end; ++i) { memcpy(pdata, &points->data[i].ts, sizeof(uint64_t)); pdata += sizeof(uint64_t); @@ -713,7 +718,7 @@ unsigned char * siridb_points_raw_string( assert(0); } - for (uint_fast32_t i = start; i < end; ++i, ++psz) + for (i = start; i < end; ++i, ++psz) { memcpy(pdata, points->data[i].val.str, *psz); pdata += *psz; @@ -1266,21 +1271,28 @@ static unsigned char * POINTS_zip_raw( size_t * size) { uint_fast32_t n = end - start; + uint_fast32_t i; + unsigned char * bits; + unsigned char * pt; + *size = n * 16; *cinfo = 0xffff; - unsigned char * bits = (unsigned char *) malloc(*size); + + bits = (unsigned char *) malloc(*size); if (bits == NULL) { return NULL; } - unsigned char * pt = bits; - for (uint_fast32_t i = start; i < end; ++i) + + pt = bits; + for (i = start; i < end; ++i) { memcpy(pt, &points->data[i].ts, sizeof(uint64_t)); pt += sizeof(uint64_t); memcpy(pt, &points->data[i].val, sizeof(uint64_t)); pt += sizeof(uint64_t); } + return bits; } diff --git a/src/siri/db/pool.c b/src/siri/db/pool.c index c26855f0..af34cc15 100644 --- a/src/siri/db/pool.c +++ b/src/siri/db/pool.c @@ -31,14 +31,15 @@ */ int siridb_pool_online(siridb_pool_t * pool) { - for (uint16_t i = 0; i < pool->len; i++) + uint16_t i; + for (i = 0; i < pool->len; i++) { if (siridb_server_is_online(pool->server[i])) { - return 1; // true + return 1; /* true */ } } - return 0; // false + return 0; /* false */ } /* @@ -51,14 +52,15 @@ int siridb_pool_online(siridb_pool_t * pool) */ int siridb_pool_available(siridb_pool_t * pool) { - for (uint16_t i = 0; i < pool->len; i++) + uint16_t i; + for (i = 0; i < pool->len; i++) { if (siridb_server_is_available(pool->server[i])) { - return 1; // true + return 1; /* true */ } } - return 0; // false + return 0; /* false */ } /* @@ -71,14 +73,15 @@ int siridb_pool_available(siridb_pool_t * pool) */ int siridb_pool_accessible(siridb_pool_t * pool) { - for (uint16_t i = 0; i < pool->len; i++) + uint16_t i; + for (i = 0; i < pool->len; i++) { if (siridb_server_is_accessible(pool->server[i])) { - return 1; // true + return 1; /* true */ } } - return 0; // false + return 0; /* false */ } @@ -176,8 +179,9 @@ int siridb_pool_send_pkg( int flags) { siridb_server_t * server = NULL; + uint16_t i; - for (uint16_t i = 0; i < pool->len; i++) + for (i = 0; i < pool->len; i++) { if ((flags & FLAG_ONLY_CHECK_ONLINE) ? siridb_server_is_online(pool->server[i]) : diff --git a/src/siri/db/pools.c b/src/siri/db/pools.c index ec2c325b..6833956f 100644 --- a/src/siri/db/pools.c +++ b/src/siri/db/pools.c @@ -143,15 +143,16 @@ siridb_pool_t * siridb_pools_append( */ int siridb_pools_online(siridb_t * siridb) { - for (uint16_t pid = 0; pid < siridb->pools->len; pid++) + uint16_t pid ; + for (pid = 0; pid < siridb->pools->len; pid++) { if ( pid != siridb->server->pool && !siridb_pool_online(siridb->pools->pool + pid)) { - return 0; // false + return 0; /* false */ } } - return 1; //true + return 1; /* true */ } /* @@ -162,15 +163,16 @@ int siridb_pools_online(siridb_t * siridb) */ int siridb_pools_available(siridb_t * siridb) { - for (uint16_t pid = 0; pid < siridb->pools->len; pid++) + uint16_t pid; + for (pid = 0; pid < siridb->pools->len; pid++) { if ( pid != siridb->server->pool && !siridb_pool_available(siridb->pools->pool + pid)) { - return 0; // false + return 0; /* false */ } } - return 1; //true + return 1; /* true */ } @@ -182,15 +184,16 @@ int siridb_pools_available(siridb_t * siridb) */ int siridb_pools_accessible(siridb_t * siridb) { - for (uint16_t pid = 0; pid < siridb->pools->len; pid++) + uint16_t pid; + for (pid = 0; pid < siridb->pools->len; pid++) { if ( pid != siridb->server->pool && !siridb_pool_accessible(siridb->pools->pool + pid)) { - return 0; // false + return 0; /* false */ } } - return 1; //true + return 1; /* true */ } /* @@ -224,8 +227,9 @@ void siridb_pools_send_pkg( else { siridb_pool_t * pool; + uint16_t pid; - for (uint16_t pid = 0; pid < siridb->pools->len; pid++) + for (pid = 0; pid < siridb->pools->len; pid++) { if (pid == siridb->server->pool) { @@ -287,8 +291,9 @@ void siridb_pools_send_pkg_2some( else { siridb_pool_t * pool; + size_t i; - for (size_t i = 0; i < slist->len; i++) + for (i = 0; i < slist->len; i++) { pool = slist->data[i]; diff --git a/src/siri/db/props.c b/src/siri/db/props.c index 0d564e35..c63bb4ae 100644 --- a/src/siri/db/props.c +++ b/src/siri/db/props.c @@ -175,8 +175,12 @@ extern char * who_am_i; void siridb_init_props(void) { - for (uint_fast16_t i = 0; i < KW_COUNT; i++) + uint_fast16_t i; + + for (i = 0; i < KW_COUNT; i++) + { siridb_props[i] = NULL; + } siridb_props[CLERI_GID_K_ACTIVE_HANDLES - KW_OFFSET] = prop_active_handles; diff --git a/src/siri/db/query.c b/src/siri/db/query.c index fe5f1428..55fa4ae1 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -39,7 +39,7 @@ #define QUERY_TOO_LONG -1 #define QUERY_MAX_LENGTH 8192 #define QUERY_EXTRA_ALLOC_SIZE 200 -#define SIRIDB_FWD_SERVERS_TIMEOUT 5000 // 5 seconds +#define SIRIDB_FWD_SERVERS_TIMEOUT 5000 /* 5 seconds */ static void QUERY_send_invalid_error(uv_async_t * handle); static void QUERY_parse(uv_async_t * handle); @@ -224,7 +224,7 @@ void siridb_query_send_error( sirinet_pkg_t * package = sirinet_pkg_err( query->pid, strlen(query->err_msg), - err, // usually this is CPROTO_ERR_QUERY, CPROTO_ERR_POOL etc. + err, /* usually this is CPROTO_ERR_QUERY, CPROTO_ERR_POOL...*/ query->err_msg); log_warning("(%s) %s", sirinet_cproto_server_str(err), query->err_msg); @@ -390,7 +390,7 @@ int siridb_query_err_from_pkg(siridb_query_t * query, sirinet_pkg_t * pkg) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if (qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // error_msg + qp_is_raw(qp_next(&unpacker, NULL)) && /* error_msg */ qp_is_raw(qp_next(&unpacker, &qp_err)) && qp_err.len < SIRIDB_MAX_SIZE_ERR_MSG) { diff --git a/src/siri/db/reindex.c b/src/siri/db/reindex.c index 36e7d7ed..52e77830 100644 --- a/src/siri/db/reindex.c +++ b/src/siri/db/reindex.c @@ -39,10 +39,10 @@ #include #include -#define REINDEX_SLEEP 100 // 100 milliseconds * active tasks -#define REINDEX_RETRY 5000 // 5 seconds -#define REINDEX_INITWAIT 20000 // 20 seconds -#define REINDEX_TIMEOUT 300000 // 5 minutes +#define REINDEX_SLEEP 100 /* 100 milliseconds * active tasks */ +#define REINDEX_RETRY 5000 /* 5 seconds */ +#define REINDEX_INITWAIT 20000 /* 20 seconds */ +#define REINDEX_TIMEOUT 300000 /* 5 minutes */ #define NEXT_SERIES_ERR -1 #define NEXT_SERIES_SET 0 diff --git a/src/siri/db/replicate.c b/src/siri/db/replicate.c index 3495bcd7..7a0bfb45 100644 --- a/src/siri/db/replicate.c +++ b/src/siri/db/replicate.c @@ -24,8 +24,8 @@ #include #include -#define REPLICATE_SLEEP 10 // 10 milliseconds * active tasks -#define REPLICATE_TIMEOUT 300000 // 5 minutes +#define REPLICATE_SLEEP 10 /* 10 milliseconds * active tasks */ +#define REPLICATE_TIMEOUT 300000 /* 5 minutes */ static void REPLICATE_work(uv_timer_t * handle); static void REPLICATE_on_repl_response( @@ -287,10 +287,10 @@ sirinet_pkg_t * siridb_replicate_pkg_filter( qp_obj_t qp_series_name; - qp_next(&unpacker, NULL); // map + qp_next(&unpacker, NULL); /* map */ qp_add_type(netpacker, QP_MAP_OPEN); - qp_next(&unpacker, &qp_series_name); // first series or end + qp_next(&unpacker, &qp_series_name); /* first series or end */ while (qp_is_raw_term(&qp_series_name)) { series = (siridb_series_t *) ct_get( diff --git a/src/siri/db/series.c b/src/siri/db/series.c index 8f54c615..c26170f7 100644 --- a/src/siri/db/series.c +++ b/src/siri/db/series.c @@ -225,8 +225,9 @@ int siridb_series_add_pcache( else { siridb_point_t *__restrict point; + size_t i; - for (size_t i = 0; i < pcache->len; i++) + for (i = 0; i < pcache->len; i++) { point = pcache->data + i; @@ -328,6 +329,9 @@ siridb_series_t * siridb_series_new( */ void siridb__series_free(siridb_series_t *__restrict series) { + siridb_shard_t * shard; + uint_fast32_t i; + #if DEBUG if (siri.status == SIRI_STATUS_RUNNING || 0) { @@ -335,10 +339,8 @@ void siridb__series_free(siridb_series_t *__restrict series) } #endif - siridb_shard_t * shard; - /* mark shards with dropped series flag */ - for (uint_fast32_t i = 0; i < series->idx_len; i++) + for (i = 0; i < series->idx_len; i++) { shard = series->idx[i].shard; shard->flags |= SIRIDB_SHARD_HAS_DROPPED_SERIES; @@ -367,13 +369,15 @@ void siridb__series_free(siridb_series_t *__restrict series) */ int siridb_series_load(siridb_t * siridb) { + imap_t * dropped; + #if DEBUG /* we must have a server because we need to know the pool id */ assert (siridb->server != NULL); #endif log_info("Loading series"); - imap_t * dropped = imap_new(); + dropped = imap_new(); if (dropped == NULL) { @@ -1249,10 +1253,12 @@ static void SERIES_idx_sort( */ static void SERIES_update_overlap(siridb_series_t *__restrict series) { + uint_fast32_t i; + #if DEBUG assert (series->flags & SIRIDB_SERIES_HAS_OVERLAP); #endif - for (uint_fast32_t i = 1; i < series->idx_len; i++) + for (i = 1; i < series->idx_len; i++) { if (series->idx[i - 1].end_ts > series->idx[i].start_ts) { @@ -1485,7 +1491,7 @@ static int SERIES_load(siridb_t * siridb, imap_t * dropped) if (!xpath_file_exist(fn)) { - // missing series file, create an empty file and return + /* missing series file, create an empty file and return */ return SERIES_save(siridb); } @@ -1687,7 +1693,9 @@ static void SERIES_update_end(siridb_series_t *__restrict series) { uint64_t start = 0; idx_t * idx; - for (uint_fast32_t i = series->idx_len; i--;) + uint_fast32_t i; + + for (i = series->idx_len; i--;) { idx = series->idx + i; diff --git a/src/siri/db/server.c b/src/siri/db/server.c index 0f6d5abd..37b7ee86 100644 --- a/src/siri/db/server.c +++ b/src/siri/db/server.c @@ -26,8 +26,8 @@ #define SIRIDB_SERVERS_FN "servers.dat" #define SIRIDB_SERVERS_SCHEMA 1 -#define SIRIDB_SERVER_FLAGS_TIMEOUT 5000 // 5 seconds -#define SIRIDB_SERVER_PROMISES_QUEUE_SIZE 250 // max concurrent promises +#define SIRIDB_SERVER_FLAGS_TIMEOUT 5000 /* 5 seconds */ +#define SIRIDB_SERVER_PROMISES_QUEUE_SIZE 250 /* max concurrent promises */ #define FMT_AS_IPV6(addr) (strchr(addr, ':') != NULL) static int SERVER_update_name(siridb_server_t * server); @@ -792,7 +792,9 @@ char * siridb_server_str_status(siridb_server_t * server) /* we must initialize the buffer according to the longest possible value */ char buffer[128] = {}; int n = 0; - for (int i = 1; i < SERVER_FLAG_AUTHENTICATED; i *= 2) + int i; + + for (i = 1; i < SERVER_FLAG_AUTHENTICATED; i *= 2) { if (server->flags & i) { @@ -835,7 +837,7 @@ siridb_server_t * siridb_server_from_node( switch (server_node->cl_obj->tp) { - case CLERI_TP_CHOICE: // server name + case CLERI_TP_CHOICE: /* server name */ { char name[server_node->len - 1]; strx_extract_string(name, server_node->str, server_node->len); @@ -843,7 +845,7 @@ siridb_server_t * siridb_server_from_node( } break; - case CLERI_TP_REGEX: // uuid + case CLERI_TP_REGEX: /* uuid */ { uuid_t uuid; char * str_uuid = strndup(server_node->str, server_node->len); diff --git a/src/siri/db/servers.c b/src/siri/db/servers.c index 40d92d80..10bc8243 100644 --- a/src/siri/db/servers.c +++ b/src/siri/db/servers.c @@ -334,12 +334,14 @@ slist_t * siridb_servers_other2slist(siridb_t * siridb) { siridb_server_t * server; slist_t * servers = slist_new(siridb->servers->len - 1); + llist_node_t * node; + if (servers == NULL) { return NULL; } - for ( llist_node_t * node = siridb->servers->first; + for ( node = siridb->servers->first; node != NULL; node = node->next) { @@ -378,8 +380,9 @@ void siridb_servers_send_pkg( else { siridb_server_t * server; + size_t i; - for (size_t i = 0; i < servers->len; i++) + for (i = 0; i < servers->len; i++) { server = (siridb_server_t *) servers->data[i]; @@ -552,7 +555,7 @@ int siridb_servers_list(siridb_server_t * server, uv_async_t * handle) (cexpr_cb_t) siridb_server_cexpr_cb, &wserver)) { - return 0; // false + return 0; /* false */ } qp_add_type(query->packer, QP_ARRAY_OPEN); @@ -711,7 +714,7 @@ int siridb_servers_list(siridb_server_t * server, uv_async_t * handle) qp_add_type(query->packer, QP_ARRAY_CLOSE); - return 1; // true + return 1; /* true */ } /* @@ -725,7 +728,9 @@ int siridb_servers_check_version(siridb_t * siridb, char * version) { siridb_server_t * server; int n = 0; - for ( llist_node_t * node = siridb->servers->first; + llist_node_t * node; + + for ( node = siridb->servers->first; node != NULL; node = node->next) { diff --git a/src/siri/db/shard.c b/src/siri/db/shard.c index 7f0566e4..cef76232 100644 --- a/src/siri/db/shard.c +++ b/src/siri/db/shard.c @@ -440,15 +440,17 @@ int siridb_shard_cexpr_cb( int siridb_shard_status(char * str, siridb_shard_t * shard) { char * pt = str; + int i; + uint8_t flags; if (shard->replacing != NULL) { pt += sprintf(pt, "optimizing"); } - uint8_t flags = shard->flags; + flags = shard->flags; - for (int i = 1; i < SHARD_STATUS_SIZE && flags; i++) + for (i = 1; i < SHARD_STATUS_SIZE && flags; i++) { if ((flags & flags_map[i].flag) == flags_map[i].flag) { @@ -646,7 +648,7 @@ int siridb_shard_get_points_num32( if (fseeko(idx->shard->fp->fp, idx->pos, SEEK_SET) || fread( temp, - 12, // NUM32 point size + 12, /* NUM32 point size */ idx->len, idx->shard->fp->fp) != idx->len) { @@ -679,7 +681,8 @@ int siridb_shard_get_points_num32( /* crop from end if needed */ if (end_ts != NULL) { - for ( uint32_t * p = temp + 3 * (idx->len - 1); + uint32_t * p; + for ( p = temp + 3 * (idx->len - 1); *p >= *end_ts; p -= 3, len--); } @@ -688,7 +691,8 @@ int siridb_shard_get_points_num32( points->len && (idx->shard->flags & SIRIDB_SHARD_HAS_OVERLAP)) { - for (uint64_t ts; points->len < len; pt += 3) + uint64_t ts; + for (; points->len < len; pt += 3) { ts = (uint64_t) *pt; siridb_points_add_point(points, &ts, ((qp_via_t *) (pt + 1))); @@ -741,7 +745,7 @@ int siridb_shard_get_points_num64( if (fseeko(idx->shard->fp->fp, idx->pos, SEEK_SET) || fread( temp, - 16, // NUM64 point size + 16, /* NUM64 point size */ idx->len, idx->shard->fp->fp) != idx->len) { @@ -774,7 +778,8 @@ int siridb_shard_get_points_num64( /* crop from end if needed */ if (end_ts != NULL) { - for ( uint64_t * p = temp + 2 * (idx->len - 1); + uint64_t * p; + for ( p = temp + 2 * (idx->len - 1); *p >= *end_ts; p -= 2, len--); } @@ -1037,7 +1042,8 @@ int siridb_shard_get_points_log32( /* crop from end if needed */ if (end_ts != NULL) { - for (uint32_t * p = tdata + (idx->len - 1); *p >= *end_ts; --p, len--); + uint32_t * p; + for (p = tdata + (idx->len - 1); *p >= *end_ts; --p, len--); } if ( has_overlap && @@ -1153,7 +1159,8 @@ int siridb_shard_get_points_log64( /* crop from end if needed */ if (end_ts != NULL) { - for (uint64_t * p = tdata + (idx->len - 1); *p >= *end_ts; --p, len--); + uint64_t * p; + for (p = tdata + (idx->len - 1); *p >= *end_ts; --p, len--); } if ( has_overlap && @@ -1197,6 +1204,7 @@ int siridb_shard_optimize(siridb_shard_t * shard, siridb_t * siridb) uint64_t duration = (shard->tp == SIRIDB_SHARD_TP_NUMBER) ? siridb->duration_num : siridb->duration_log; siridb_series_t * series; + size_t i; uv_mutex_lock(&siridb->shards_mutex); @@ -1269,7 +1277,7 @@ int siridb_shard_optimize(siridb_shard_t * shard, siridb_t * siridb) sleep(1); - for (size_t i = 0; i < slist->len; i++) + for (i = 0; i < slist->len; i++) { /* its possible that another database is paused, but we wait anyway */ if (siri.optimize->pause) @@ -1466,12 +1474,13 @@ void siridb_shard_drop(siridb_shard_t * shard, siridb_t * siridb) if (optimizing) { slist_t * slist = imap_2slist_ref(siridb->series_map); + size_t i; if (slist == NULL) { ERR_ALLOC } - else for (size_t i = 0; i < slist->len; i++) + else for (i = 0; i < slist->len; i++) { series = (siridb_series_t *) slist->data[i]; if (shard->id % siridb->duration_num == series->mask) @@ -1487,12 +1496,13 @@ void siridb_shard_drop(siridb_shard_t * shard, siridb_t * siridb) else { slist_t * slist = imap_2slist(siridb->series_map); + size_t i; if (slist == NULL) { ERR_ALLOC } - else for (size_t i = 0; i < slist->len; i++) + else for (i = 0; i < slist->len; i++) { series = (siridb_series_t *) slist->data[i]; if (shard->id % siridb->duration_num == series->mask) @@ -1615,7 +1625,7 @@ static ssize_t SHARD_apply_idx( return 0; } - len = *((uint16_t *) (pt + (is_ts64 ? 20 : 12))); // LEN POS IN INDEX + len = *((uint16_t *) (pt + (is_ts64 ? 20 : 12))); /* LEN POS IN INDEX */ series = imap_get(siridb->series_map, series_id); if (shard->tp == SIRIDB_SHARD_TP_LOG) @@ -1677,10 +1687,10 @@ static ssize_t SHARD_apply_idx( if (siridb_series_add_idx( series, shard, - is_ts64 ? // START_TS IN HEADER + is_ts64 ? /* START_TS IN HEADER */ (uint64_t) *((uint64_t *) (pt + 4)) : (uint64_t) *((uint32_t *) (pt + 4)), - is_ts64 ? // END_TS IN HEADER + is_ts64 ? /* END_TS IN HEADER */ (uint64_t) *((uint64_t *) (pt + 12)) : (uint64_t) *((uint32_t *) (pt + 8)), (uint32_t) pos, @@ -1816,7 +1826,7 @@ static int SHARD_load_idx( return -1; } - rc = fseeko(fp, sz, SEEK_CUR); // 16 = NUM64 point size + rc = fseeko(fp, sz, SEEK_CUR); /* 16 = NUM64 point size */ if (rc != 0) { log_error( diff --git a/src/siri/db/shards.c b/src/siri/db/shards.c index a52480cb..2731b724 100644 --- a/src/siri/db/shards.c +++ b/src/siri/db/shards.c @@ -247,7 +247,8 @@ static bool is_shard_fn(const char * fn, const char * ext) */ static bool is_temp_fn(const char * fn) { - for (int i = 0; i < 2; i++, fn++) + int i; + for (i = 0; i < 2; i++, fn++) { if (*fn != '_') { diff --git a/src/siri/db/user.c b/src/siri/db/user.c index 011bec5f..72111c8a 100644 --- a/src/siri/db/user.c +++ b/src/siri/db/user.c @@ -198,7 +198,7 @@ int siridb_user_check_access( { if ((user->access_bit & access_bit) == access_bit) { - return 1; // true + return 1; /* true */ } char buffer[SIRIDB_ACCESS_STR_MAX]; @@ -210,7 +210,7 @@ int siridb_user_check_access( user->name, buffer); - return 0; // false + return 0; /* false */ } int siridb_user_cexpr_cb(siridb_user_t * user, cexpr_condition_t * cond) diff --git a/src/siri/db/variance.c b/src/siri/db/variance.c index 2fb1c265..78df62c1 100644 --- a/src/siri/db/variance.c +++ b/src/siri/db/variance.c @@ -18,18 +18,19 @@ double siridb_variance(siridb_points_t * points) { double mean = 0.0; double variance = 0.0; + size_t i; switch (points->tp) { case TP_INT: - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { mean += (points->data + i)->val.int64; } mean /= points->len; - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { variance += pow( (double) (points->data + i)->val.int64 - mean, @@ -37,14 +38,14 @@ double siridb_variance(siridb_points_t * points) } break;\ case TP_DOUBLE: - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { mean += (points->data + i)->val.real; } mean /= points->len; - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { variance += pow( (points->data + i)->val.real - mean, diff --git a/src/siri/file/handler.c b/src/siri/file/handler.c index 8b45ed87..844fa8d1 100644 --- a/src/siri/file/handler.c +++ b/src/siri/file/handler.c @@ -42,13 +42,15 @@ siri_fh_t * siri_fh_new(uint16_t size) */ void siri_fh_free(siri_fh_t * fh) { + siri_fp_t ** fp; + uint16_t i; + if (fh == NULL) { return; } - siri_fp_t ** fp; - for (uint16_t i = 0; i < fh->size; i++) + for (i = 0; i < fh->size; i++) { fp = fh->fpointers + i; diff --git a/src/siri/help/help.c b/src/siri/help/help.c index 15d9d99a..d4f87c36 100644 --- a/src/siri/help/help.c +++ b/src/siri/help/help.c @@ -120,11 +120,13 @@ const char * siri_help_get( */ void siri_help_free(void) { + uint_fast16_t i; + #if DEBUG log_debug("Free help"); #endif - for (uint_fast16_t i = 0; i < HELP_COUNT; i ++) + for (i = 0; i < HELP_COUNT; i ++) { free(siri_help_content[i]); } diff --git a/src/siri/net/clserver.c b/src/siri/net/clserver.c index dceaf72f..8c4e75b8 100644 --- a/src/siri/net/clserver.c +++ b/src/siri/net/clserver.c @@ -100,7 +100,7 @@ static void CLSERVER_on_register_server_response( #define POOL_ERR_MSG \ "At least one pool has no server available to process the request" -#define POOL_ERR_LEN 64 // exact length of POOL_ERR_MSG +#define POOL_ERR_LEN 64 /* exact length of POOL_ERR_MSG */ int sirinet_clserver_init(siri_t * siri) @@ -938,8 +938,9 @@ static void CLSERVER_on_register_server_response( sirinet_promise_t * promise; size_t err_count = 0; char err_msg[SIRIDB_MAX_SIZE_ERR_MSG]; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; if (promise == NULL) diff --git a/src/siri/net/promises.c b/src/siri/net/promises.c index f5596d17..1139b53a 100644 --- a/src/siri/net/promises.c +++ b/src/siri/net/promises.c @@ -56,7 +56,9 @@ sirinet_promises_t * sirinet_promises_new( void sirinet_promises_llist_free(slist_t * promises) { sirinet_promise_t * promise; - for (size_t i = 0; i < promises->len; i++) + size_t i; + + for (i = 0; i < promises->len; i++) { promise = (sirinet_promise_t *) promises->data[i]; if (promise != NULL) diff --git a/src/siri/net/socket.c b/src/siri/net/socket.c index 539226eb..49a1551b 100644 --- a/src/siri/net/socket.c +++ b/src/siri/net/socket.c @@ -19,15 +19,15 @@ #include #include -#define MAX_ALLOWED_PKG_SIZE 20971520 // 20 MB +#define MAX_ALLOWED_PKG_SIZE 20971520 /* 20 MB */ #define QUIT_SOCKET \ - free(ssocket->buf); \ + free(ssocket->buf); \ ssocket->buf = NULL; \ - ssocket->len = 0; \ - ssocket->size = 0; \ + ssocket->len = 0; \ + ssocket->size = 0; \ ssocket->on_data = NULL; \ - sirinet_socket_decref(client); \ + sirinet_socket_decref(client); \ return; /* dns_req_family_map maps to IP_SUPPORT values defined in socket.h */ @@ -280,21 +280,21 @@ void sirinet__socket_free(uv_stream_t * client) switch (ssocket->tp) { - case SOCKET_CLIENT: // listens to client connections + case SOCKET_CLIENT: /* listens to client connections */ if (ssocket->origin != NULL) { siridb_user_t * user = (siridb_user_t *) ssocket->origin; siridb_user_decref(user); } break; - case SOCKET_BACKEND: // listens to server connections + case SOCKET_BACKEND: /* listens to server connections */ if (ssocket->origin != NULL) { siridb_server_t * server = (siridb_server_t *) ssocket->origin; siridb_server_decref(server); } break; - case SOCKET_SERVER: // a server connection + case SOCKET_SERVER: /* a server connection */ { siridb_server_t * server = (siridb_server_t *) ssocket->origin; server->socket = NULL; @@ -302,7 +302,7 @@ void sirinet__socket_free(uv_stream_t * client) siridb_server_decref(server); } break; - case SOCKET_MANAGE: // a server manage connection + case SOCKET_MANAGE: /* a server manage connection */ siri_admin_client_free((siri_admin_client_t *) ssocket->origin); siri.socket = NULL; break; diff --git a/src/siri/optimize.c b/src/siri/optimize.c index 1b56f065..4a22b644 100644 --- a/src/siri/optimize.c +++ b/src/siri/optimize.c @@ -274,6 +274,7 @@ static void OPTIMIZE_work(uv_work_t * work __attribute__((unused))) siridb_t * siridb; siridb_shard_t * shard; uint8_t c = siri.cfg->shard_compression; + size_t i; log_info("Start optimize task"); @@ -287,7 +288,7 @@ static void OPTIMIZE_work(uv_work_t * work __attribute__((unused))) slsiridb = llist2slist(siri.siridb_list); if (slsiridb != NULL) { - for (size_t i = 0; i < slsiridb->len; i++) + for (i = 0; i < slsiridb->len; i++) { siridb = (siridb_t *) slsiridb->data[i]; siridb_incref(siridb); @@ -302,8 +303,9 @@ static void OPTIMIZE_work(uv_work_t * work __attribute__((unused))) return; } - for (size_t i = 0; i < slsiridb->len; i++) + for (i = 0; i < slsiridb->len; i++) { + size_t j; siridb = (siridb_t *) slsiridb->data[i]; #if DEBUG @@ -325,9 +327,9 @@ static void OPTIMIZE_work(uv_work_t * work __attribute__((unused))) sleep(1); - for (size_t i = 0; i < slshards->len; i++) + for (j = 0; j < slshards->len; j++) { - shard = (siridb_shard_t *) slshards->data[i]; + shard = (siridb_shard_t *) slshards->data[j]; if (!siri_err && optimize.status != SIRI_OPTIMIZE_CANCELLED && @@ -393,7 +395,9 @@ static void OPTIMIZE_cleanup(slist_t * slsiridb) if (slsiridb != NULL) { siridb_t * siridb; - for (size_t i = 0; i < slsiridb->len; i++) + size_t i; + + for (i = 0; i < slsiridb->len; i++) { siridb = (siridb_t *) slsiridb->data[i]; siridb_decref(siridb); diff --git a/src/siri/parser/listener.c b/src/siri/parser/listener.c index f771f3f0..c24f8f02 100644 --- a/src/siri/parser/listener.c +++ b/src/siri/parser/listener.c @@ -43,8 +43,8 @@ #include -#define MAX_ITERATE_COUNT 10000 // ten-thousand -#define MAX_BATCH_REQUIRE_SHARD 100 // after reading 100 shards, iterate +#define MAX_ITERATE_COUNT 10000 /* ten-thousand */ +#define MAX_BATCH_REQUIRE_SHARD 100 /* after reading 100 shards, iterate */ #define QP_ADD_SUCCESS qp_add_raw( \ query->packer, (const unsigned char *) "success_msg", 11); @@ -394,7 +394,9 @@ if (IS_MASTER && \ void siriparser_init_listener(void) { - for (uint_fast16_t i = 0; i < CLERI_END; i++) + uint_fast16_t i; + + for (i = 0; i < CLERI_END; i++) { siriparser_listen_enter[i] = NULL; siriparser_listen_exit[i] = NULL; @@ -487,7 +489,7 @@ void siriparser_init_listener(void) siriparser_listen_exit[CLERI_GID_SHOW_STMT] = exit_show_stmt; siriparser_listen_exit[CLERI_GID_TIMEIT_STMT] = exit_timeit_stmt; - for (uint_fast16_t i = HELP_OFFSET; i < HELP_OFFSET + HELP_COUNT; i++) + for (i = HELP_OFFSET; i < HELP_OFFSET + HELP_COUNT; i++) { siriparser_listen_exit[i] = exit_help_xxx; } @@ -806,6 +808,7 @@ static void enter_group_match(uv_async_t * handle) else { siridb_series_t * series; + size_t i; q_wrapper->series_tmp = (q_wrapper->update_cb == NULL) ? q_wrapper->series_map : imap_new(); @@ -817,7 +820,7 @@ static void enter_group_match(uv_async_t * handle) uv_mutex_lock(&siridb->groups->mutex); - for (size_t i = 0; i < group->series->len; i++) + for (i = 0; i < group->series->len; i++) { series = (siridb_series_t *) group->series->data[i]; siridb_series_incref(series); @@ -1835,9 +1838,13 @@ static void exit_count_series_length(uv_async_t * handle) if (q_count->where_expr == NULL) { + size_t i; + slist_t * slist; + siridb_series_t * series; + uv_mutex_lock(&siridb->series_mutex); - slist_t * slist = imap_2slist((q_count->series_map == NULL) ? + slist = imap_2slist((q_count->series_map == NULL) ? siridb->series_map : q_count->series_map); uv_mutex_unlock(&siridb->series_mutex); @@ -1847,9 +1854,7 @@ static void exit_count_series_length(uv_async_t * handle) MEM_ERR_RET } - siridb_series_t * series; - - for (size_t i = 0; i < slist->len; i++) + for (i = 0; i < slist->len; i++) { series = (siridb_series_t *) slist->data[i]; q_count->n += series->length; @@ -1874,6 +1879,8 @@ static void exit_count_series_length(uv_async_t * handle) } else { + uv_async_t * next; + uv_mutex_lock(&siridb->series_mutex); q_count->slist = imap_2slist_ref( @@ -1887,8 +1894,7 @@ static void exit_count_series_length(uv_async_t * handle) MEM_ERR_RET } - uv_async_t * next = - (uv_async_t *) malloc(sizeof(uv_async_t)); + next = (uv_async_t *) malloc(sizeof(uv_async_t)); if (next == NULL) { @@ -1914,10 +1920,10 @@ static void exit_count_servers(uv_async_t * handle) query_count_t * q_count = (query_count_t *) query->data; cexpr_t * where_expr = q_count->where_expr; cexpr_cb_t cb = (cexpr_cb_t) siridb_server_cexpr_cb; + int is_local = IS_MASTER; qp_add_raw(query->packer, (const unsigned char *) "servers", 7); - int is_local = IS_MASTER; /* if is_local, check if we use 'remote' props in where expression */ if (is_local && where_expr != NULL) @@ -1927,7 +1933,8 @@ static void exit_count_servers(uv_async_t * handle) if (is_local) { - for ( llist_node_t * node = siridb->servers->first; + llist_node_t * node; + for ( node = siridb->servers->first; node != NULL; node = node->next) { @@ -2048,10 +2055,12 @@ static void exit_count_shards(uv_async_t * handle) siridb_shard_view_t vshard = { .server=siridb->server }; + size_t i; + slist_t * shards_list; uv_mutex_lock(&siridb->shards_mutex); - slist_t * shards_list = imap_2slist_ref(siridb->shards); + shards_list = imap_2slist_ref(siridb->shards); uv_mutex_unlock(&siridb->shards_mutex); @@ -2060,7 +2069,7 @@ static void exit_count_shards(uv_async_t * handle) MEM_ERR_RET } - for (size_t i = 0; i < shards_list->len; i++) + for (i = 0; i < shards_list->len; i++) { vshard.shard = (siridb_shard_t *) shards_list->data[i]; @@ -2105,16 +2114,17 @@ static void exit_count_shards_size(uv_async_t * handle) siridb_t * siridb = ((sirinet_socket_t *) query->client->data)->siridb; query_count_t * q_count = (query_count_t *) query->data; uint64_t duration; - - qp_add_raw(query->packer, (const unsigned char *) "shards_size", 11); - + size_t i; + slist_t * shards_list; siridb_shard_view_t vshard = { .server=siridb->server }; + qp_add_raw(query->packer, (const unsigned char *) "shards_size", 11); + uv_mutex_lock(&siridb->shards_mutex); - slist_t * shards_list = imap_2slist_ref(siridb->shards); + shards_list = imap_2slist_ref(siridb->shards); uv_mutex_unlock(&siridb->shards_mutex); @@ -2123,7 +2133,7 @@ static void exit_count_shards_size(uv_async_t * handle) MEM_ERR_RET } - for (size_t i = 0; i < shards_list->len; i++) + for (i = 0; i < shards_list->len; i++) { vshard.shard = (siridb_shard_t *) shards_list->data[i]; @@ -2562,10 +2572,10 @@ static void exit_drop_shards(uv_async_t * handle) siridb_shard_view_t vshard = { .server=siridb->server }; - size_t dropped = 0; + size_t i; - for (size_t i = 0; i < q_drop->shards_list->len; i++) + for (i = 0; i < q_drop->shards_list->len; i++) { vshard.shard = (siridb_shard_t *) q_drop->shards_list->data[i]; @@ -2613,11 +2623,13 @@ static void exit_drop_shards(uv_async_t * handle) } else { + uv_async_t * next; + QP_ADD_SUCCESS q_drop->n = q_drop->shards_list->len; - uv_async_t * next = (uv_async_t *) malloc(sizeof(uv_async_t)); + next = (uv_async_t *) malloc(sizeof(uv_async_t)); if (next == NULL) { @@ -2770,7 +2782,8 @@ static void exit_list_groups(uv_async_t * handle) if (!is_local) { is_local = 1; - for (size_t i = 0; i < q_list->props->len; i++) + size_t i; + for (i = 0; i < q_list->props->len; i++) { if (siridb_group_is_remote_prop( *((uint32_t *) q_list->props->data[i]))) @@ -2960,7 +2973,8 @@ static void exit_list_servers(uv_async_t * handle) /* if is_local, check if we need ask for 'remote' columns */ if (is_local && q_list->props != NULL) { - for (size_t i = 0; i < q_list->props->len; i++) + size_t i; + for (i = 0; i < q_list->props->len; i++) { if (siridb_server_is_remote_prop( *((uint32_t *) q_list->props->data[i]))) @@ -3043,10 +3057,12 @@ static void exit_list_shards(uv_async_t * handle) siridb_shard_view_t vshard = { .server=siridb->server }; + size_t i; + slist_t * shards_list; uv_mutex_lock(&siridb->shards_mutex); - slist_t * shards_list = imap_2slist_ref(siridb->shards); + shards_list = imap_2slist_ref(siridb->shards); uv_mutex_unlock(&siridb->shards_mutex); @@ -3081,7 +3097,7 @@ static void exit_list_shards(uv_async_t * handle) qp_add_raw(query->packer, (const unsigned char *) "shards", 6); qp_add_type(query->packer, QP_ARRAY_OPEN); - for (size_t i = 0; i < shards_list->len; i++) + for (i = 0; i < shards_list->len; i++) { vshard.shard = (siridb_shard_t *) shards_list->data[i]; @@ -3173,7 +3189,6 @@ static void exit_list_users(uv_async_t * handle) cexpr_cb_t cb = (cexpr_cb_t) siridb_user_cexpr_cb; query_list_t * q_list = (query_list_t *) query->data; cexpr_t * where_expr = q_list->where_expr; - size_t i; siridb_user_t * user; @@ -4623,8 +4638,9 @@ static void async_no_points_aggregate(uv_async_t * handle) if (points != NULL) { const char * name; + size_t i; - for (size_t i = 1; points->len && i < q_select->alist->len; i++) + for (i = 1; points->len && i < q_select->alist->len; i++) { aggr_points = siridb_aggregate_run( points, @@ -4781,8 +4797,9 @@ static void async_select_aggregate(uv_async_t * handle) if (points != NULL) { const char * name; + size_t i; - for (size_t i = 0; points->len && i < q_select->alist->len; i++) + for (i = 0; points->len && i < q_select->alist->len; i++) { aggr_points = siridb_aggregate_run( points, @@ -4890,10 +4907,10 @@ static void async_series_re(uv_async_t * handle) q_wrapper->regex, (PCRE2_SPTR8) series->name, series->name_len, - 0, // start looking at this point - 0, // OPTIONS + 0, /* start looking at this point */ + 0, /* OPTIONS */ q_wrapper->match_data, - 0); // length of sub_str_vec + 0); /* length of sub_str_vec */ if ( pcre_exec_ret < 0 || imap_add(q_wrapper->series_tmp, series->id, series)) { @@ -5006,10 +5023,10 @@ static void on_alter_xxx_response(slist_t * promises, uv_async_t * handle) sirinet_promise_t * promise; qp_unpacker_t unpacker; qp_obj_t qp_count; - query_alter_t * q_alter = (query_alter_t *) query->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5025,8 +5042,8 @@ static void on_alter_xxx_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // servers etc. - qp_is_int(qp_next(&unpacker, &qp_count))) // one result + qp_is_raw(qp_next(&unpacker, NULL)) && /* servers etc.*/ + qp_is_int(qp_next(&unpacker, &qp_count))) /* one result*/ { q_alter->n += qp_count.via.int64; @@ -5076,10 +5093,10 @@ static void on_count_xxx_response(slist_t * promises, uv_async_t * handle) sirinet_promise_t * promise; qp_unpacker_t unpacker; qp_obj_t qp_count; - query_count_t * q_count = (query_count_t *) query->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5095,8 +5112,8 @@ static void on_count_xxx_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // servers etc. - qp_is_int(qp_next(&unpacker, &qp_count))) // one result + qp_is_raw(qp_next(&unpacker, NULL)) && /* servers etc.*/ + qp_is_int(qp_next(&unpacker, &qp_count))) /* one result*/ { q_count->n += qp_count.via.int64; @@ -5146,10 +5163,10 @@ static void on_drop_series_response(slist_t * promises, uv_async_t * handle) sirinet_promise_t * promise; qp_unpacker_t unpacker; qp_obj_t qp_drop; - query_drop_t * q_drop = (query_drop_t *) query->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5165,8 +5182,8 @@ static void on_drop_series_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // servers etc. - qp_is_int(qp_next(&unpacker, &qp_drop))) // one result + qp_is_raw(qp_next(&unpacker, NULL)) && /* servers etc.*/ + qp_is_int(qp_next(&unpacker, &qp_drop))) /* one result */ { q_drop->n += qp_drop.via.int64; @@ -5202,10 +5219,10 @@ static void on_drop_shards_response(slist_t * promises, uv_async_t * handle) sirinet_promise_t * promise; qp_unpacker_t unpacker; qp_obj_t qp_drop; - query_drop_t * q_drop = (query_drop_t *) query->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5221,8 +5238,8 @@ static void on_drop_shards_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // shards - qp_is_int(qp_next(&unpacker, &qp_drop))) // one result + qp_is_raw(qp_next(&unpacker, NULL)) && /* shards */ + qp_is_int(qp_next(&unpacker, &qp_drop))) /* one result */ { q_drop->n += qp_drop.via.int64; @@ -5261,10 +5278,11 @@ static void on_groups_response(slist_t * promises, uv_async_t * handle) siridb_group_t * group; qp_obj_t qp_name; qp_obj_t qp_series; + size_t i; siridb_groups_init_nseries(siridb->groups); - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5320,8 +5338,9 @@ static void on_list_xxx_response(slist_t * promises, uv_async_t * handle) qp_unpacker_t unpacker; siridb_query_t * query = (siridb_query_t *) handle->data; query_list_t * q_list = (query_list_t *) query->data; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5337,10 +5356,10 @@ static void on_list_xxx_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // columns + qp_is_raw(qp_next(&unpacker, NULL)) && /* columns */ qp_is_array(qp_skip_next(&unpacker)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // series/... - qp_is_array(qp_next(&unpacker, NULL))) // results + qp_is_raw(qp_next(&unpacker, NULL)) && /* series/... */ + qp_is_array(qp_next(&unpacker, NULL))) /* results */ { while (qp_is_array(qp_current(&unpacker))) { @@ -5407,8 +5426,9 @@ static void on_select_response(slist_t * promises, uv_async_t * handle) qp_obj_t qp_len; qp_obj_t qp_points; qp_obj_t qp_err_msg; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5465,7 +5485,7 @@ static void on_select_response(slist_t * promises, uv_async_t * handle) qp_unpacker_init(&unpacker, pkg->data, pkg->len); if ( qp_is_map(qp_next(&unpacker, NULL)) && - qp_is_raw(qp_next(&unpacker, NULL)) && // select + qp_is_raw(qp_next(&unpacker, NULL)) && /* select */ qp_is_map(qp_next(&unpacker, NULL))) { if (q_select->merge_as == NULL) @@ -5523,13 +5543,14 @@ static void on_select_response(slist_t * promises, uv_async_t * handle) } else { + uv_async_t * next; uv_work_t * work = (uv_work_t *) malloc(sizeof(uv_work_t)); if (work == NULL) { MEM_ERR_RET } - uv_async_t * next = (uv_async_t *) malloc(sizeof(uv_async_t)); + next = (uv_async_t *) malloc(sizeof(uv_async_t)); if (next == NULL) { free(work); @@ -5573,8 +5594,9 @@ static void on_update_xxx_response(slist_t * promises, uv_async_t * handle) sirinet_promise_t * promise; siridb_query_t * query = (siridb_query_t *) handle->data; size_t err_count = 0; + size_t i; - for (size_t i = 0; i < promises->len; i++) + for (i = 0; i < promises->len; i++) { promise = promises->data[i]; @@ -5740,7 +5762,9 @@ static int items_select_master_merge( if (q_select->mlist != NULL && points != NULL) { siridb_points_t * aggr_points; - for (size_t i = 0; points->len && i < q_select->mlist->len; i++) + size_t i; + + for (i = 0; points->len && i < q_select->mlist->len; i++) { aggr_points = siridb_aggregate_run( points, @@ -5754,7 +5778,7 @@ static int items_select_master_merge( if (aggr_points == NULL) { - return -1; // (error message is set) + return -1; /* (error message is set) */ } points = aggr_points; @@ -5814,12 +5838,13 @@ static int items_select_other_merge( slist_t * plist, uv_async_t * handle) { + size_t i; siridb_query_t * query = (siridb_query_t *) handle->data; int rc = qp_add_raw_term( query->packer, (const unsigned char *) name, len) || qp_add_type(query->packer, QP_ARRAY_OPEN); - for (size_t i = 0; !rc && i < plist->len; i++) + for (i = 0; !rc && i < plist->len; i++) { rc = siridb_points_raw_pack( (siridb_points_t * ) plist->data[i], @@ -5885,7 +5910,7 @@ static void on_select_unpack_points( } } - qp_next(unpacker, NULL); // QP_ARRAY_CLOSE + qp_next(unpacker, NULL); /* QP_ARRAY_CLOSE */ } } @@ -5956,7 +5981,7 @@ static void on_select_unpack_merged_points( } } - qp_next(unpacker, NULL); // QP_ARRAY_CLOSE + qp_next(unpacker, NULL); /* QP_ARRAY_CLOSE */ } } } @@ -5970,9 +5995,10 @@ static int values_list_groups(siridb_group_t * group, uv_async_t * handle) if (where_expr == NULL || cexpr_run(where_expr, cb, group)) { + size_t i; qp_add_type(query->packer, QP_ARRAY_OPEN); - for (size_t i = 0; i < props->len; i++) + for (i = 0; i < props->len; i++) { siridb_group_prop( group, diff --git a/src/siri/parser/queries.c b/src/siri/parser/queries.c index 101dc7a8..6bce17f5 100644 --- a/src/siri/parser/queries.c +++ b/src/siri/parser/queries.c @@ -88,7 +88,7 @@ query_select_t * query_select_new(void) q_select->presuf = NULL; q_select->merge_as = NULL; q_select->n = 0; - q_select->nselects = 1; // we have at least one select function + q_select->nselects = 1; /* we have at least one select function */ q_select->points_map = NULL; q_select->alist = NULL; q_select->mlist = NULL; @@ -298,7 +298,8 @@ void query_help_free(uv_handle_t * handle) static void QUERIES_free_merge_result(slist_t * plist) { - for (size_t i = 0; i < plist->len; i ++) + size_t i; + for (i = 0; i < plist->len; i ++) { siridb_points_free(plist->data[i]); } diff --git a/src/siri/siri.c b/src/siri/siri.c index ad8d8eef..932eee26 100644 --- a/src/siri/siri.c +++ b/src/siri/siri.c @@ -67,7 +67,7 @@ static void SIRI_walk_try_close(uv_handle_t * handle, int * num); #define WAIT_BETWEEN_CLOSE_ATTEMPTS 3000 static uv_timer_t closing_timer; -static int closing_attempts = 40; // times 3 seconds is 2 minutes +static int closing_attempts = 40; /* times 3 seconds is 2 minutes */ #define N_SIGNALS 6 static int signals[N_SIGNALS] = { @@ -130,6 +130,7 @@ int siri_start(void) struct timespec start; struct timespec end; uv_signal_t sig[N_SIGNALS]; + int i; /* get start time so we can calculate the startup_time */ clock_gettime(CLOCK_MONOTONIC, &start); @@ -174,11 +175,11 @@ int siri_start(void) SIRI_destroy(); free(siri.loop); siri.loop = NULL; - return rc; // something went wrong + return rc; /* something went wrong */ } /* bind signals to the event loop */ - for (int i = 0; i < N_SIGNALS; i++) + for (i = 0; i < N_SIGNALS; i++) { uv_signal_init(siri.loop, &sig[i]); uv_signal_start(&sig[i], SIRI_signal_handler, signals[i]); @@ -219,7 +220,7 @@ void siri_free(void) { int rc; rc = uv_loop_close(siri.loop); - if (rc) // could be UV_EBUSY (-16) in case handlers are not closed yet + if (rc) /* could be UV_EBUSY (-16) in case handlers are not closed */ { log_error("Error occurred while closing the event loop: %d", rc); } diff --git a/src/strextra/strextra.c b/src/strextra/strextra.c index 0a3f9601..9c699878 100644 --- a/src/strextra/strextra.c +++ b/src/strextra/strextra.c @@ -123,19 +123,19 @@ void strx_trim(char ** str, char chr) */ char * end; - // trim leading chars + /* trim leading chars */ while ((chr && **str == chr) || (!chr && isspace(**str))) { (*str)++; } - // check all chars? + /* check all chars? */ if(**str == 0) { return; } - // trim trailing chars + /* trim trailing chars */ end = *str + strlen(*str) - 1; while (end > *str && ((chr && *end == chr) || (!chr && isspace(*end)))) @@ -143,7 +143,7 @@ void strx_trim(char ** str, char chr) end--; } - // write new null terminator + /* write new null terminator */ *(end + 1) = 0; } @@ -165,19 +165,19 @@ bool strx_is_empty(const char * str) bool strx_is_int(const char * str) { - // Handle negative numbers. + /* Handle negative numbers. */ if (*str == '-') { ++str; } - // Handle empty string or just "-". + /* Handle empty string or just "-". */ if (!*str) { return false; } - // Check for non-digit chars in the rest of the string. + /* Check for non-digit chars in the rest of the string. */ while (*str) { if (!isdigit(*str)) @@ -195,7 +195,7 @@ bool strx_is_int(const char * str) bool strx_is_float(const char * str) { - // Handle negative numbers. + /* Handle negative numbers. */ if (*str == '-' || *str == '+') { ++str; @@ -203,13 +203,13 @@ bool strx_is_float(const char * str) size_t dots = 0; - // Handle empty string or just "-". + /* Handle empty string or just "-". */ if (!*str) { return false; } - // Check for non-digit chars in the rest of the string. + /* Check for non-digit chars in the rest of the string. */ while (*str) { if (*str == '.') diff --git a/src/test/test.c b/src/test/test.c index 69a575de..2d235a0a 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -192,15 +192,15 @@ static int test_ctree(void) test_start("Testing ctree"); ct_t * ct = ct_new(); - // first add should be successful + /* first add should be successful */ assert (ct_add(ct, "Iris", "is gewoon Iris") == CT_OK); assert (ct_add(ct, "Iris1", "is gewoon Iris1") == CT_OK); assert (ct_add(ct, "Iris2", "is gewoon Iris2") == CT_OK); - // key exists + /* key exists */ assert (ct_add(ct, "Iris", "Iris?") == CT_EXISTS); - // len should be 3 by now + /* len should be 3 by now */ assert (ct->len == 3); assert (strcmp(ct_getn(ct, "Iris1!", 5), "is gewoon Iris1") == 0); assert (strcmp(ct_get(ct, "Iris"), "is gewoon Iris") == 0); @@ -465,14 +465,17 @@ static int test_imap_symmetric_difference(void) static int test_gen_pool_lookup(void) { - test_start("Testing test_gen_pool_lookup"); - - siridb_lookup_t * lookup = siridb_lookup_new(4); + int i; + siridb_lookup_t * lookup; uint16_t match[30] = { 0, 1, 0, 2, 3, 1, 0, 3, 3, 2, 2, 1, 0, 1, 0, 2, 3, 1, 0, 3, 3, 2, 2, 1, 0, 1, 0, 2, 3, 1}; - for (int i = 0; i < 30; i++) + test_start("Testing test_gen_pool_lookup"); + + lookup = siridb_lookup_new(4); + + for (i = 0; i < 30; i++) assert(match[i] == (*lookup)[i]); free(lookup); @@ -488,14 +491,15 @@ static int test_points(void) qp_via_t val; uint64_t timestamps[5] = {4, 6, 3, 5, 7}; int64_t values[5] = {1, 3, 0, 2, 4}; + size_t i; - for (int i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { val.int64 = values[i]; siridb_points_add_point(points, ×tamps[i], &val); } - for (size_t i = 0; i < points->len; i++) + for (i = 0; i < points->len; i++) { point = points->data + i; assert (i == (size_t) point->val.int64);